diff --git a/src/api/sjzx/sbryWH.js b/src/api/sjzx/sbryWH.js
index 5cd02d8..45dbef5 100644
--- a/src/api/sjzx/sbryWH.js
+++ b/src/api/sjzx/sbryWH.js
@@ -72,3 +72,27 @@ export function getSbjgrys(data) {
     data,
   });
 }
+
+export function saveJgry(data) {
+  return request({
+    url: "/emSbjgry/save",
+    method: "post",
+    data,
+  });
+}
+
+export function updateJgry(data) {
+  return request({
+    url: "/emSbjgry/update",
+    method: "post",
+    data,
+  });
+}
+export function deleteJgry(data) {
+  return request({
+    url: "/emSbjgry/delete",
+    method: "post",
+    data,
+  });
+}
+
diff --git a/src/views/jhzx/qfxqCX.vue b/src/views/jhzx/qfxqCX.vue
index 7d6acf1..d3af256 100644
--- a/src/views/jhzx/qfxqCX.vue
+++ b/src/views/jhzx/qfxqCX.vue
@@ -242,6 +242,18 @@ export default {
     this.initList()
   },
   methods: {
+    formatterZt({cellValue}){
+      if(cellValue==='0'){
+        return '正常'
+      }
+      if(cellValue==='1'){
+        return '提前'
+      }
+      if (cellValue==='2'){
+        return '拖期'
+      }
+      return cellValue
+    },
     cellClickEvent({row}) {
       this.queryParam.dcch = row.cbbm
       this.$refs.xDown4.hidePanel()
diff --git a/src/views/jhzx/qfxqSH.vue b/src/views/jhzx/qfxqSH.vue
index d895167..abd146e 100644
--- a/src/views/jhzx/qfxqSH.vue
+++ b/src/views/jhzx/qfxqSH.vue
@@ -206,6 +206,18 @@ export default {
     this.initList()
   },
   methods: {
+    formatterZt({cellValue}){
+      if(cellValue==='0'){
+        return '正常'
+      }
+      if(cellValue==='1'){
+        return '提前'
+      }
+      if (cellValue==='2'){
+        return '拖期'
+      }
+      return cellValue
+    },
     cellClickEvent({row}) {
       this.queryParam.dcch = row.cbbm
       this.$refs.xDown4.hidePanel()
diff --git a/src/views/jhzx/qfxqwh.vue b/src/views/jhzx/qfxqwh.vue
index 3896b05..697e943 100644
--- a/src/views/jhzx/qfxqwh.vue
+++ b/src/views/jhzx/qfxqwh.vue
@@ -256,6 +256,18 @@ export default {
     this.initBase()
   },
   methods: {
+    formatterZt({cellValue}){
+      if(cellValue==='0'){
+        return '正常'
+      }
+      if(cellValue==='1'){
+        return '提前'
+      }
+      if (cellValue==='2'){
+        return '拖期'
+      }
+      return cellValue
+    },
     cellClickEvent({row}) {
       this.queryParam.dcch = row.cbbm
       this.$refs.xDown4.hidePanel()
diff --git a/src/views/jhzx/qfzxGL.vue b/src/views/jhzx/qfzxGL.vue
index a71fd8c..12845ac 100644
--- a/src/views/jhzx/qfzxGL.vue
+++ b/src/views/jhzx/qfzxGL.vue
@@ -105,6 +105,18 @@ export default {
     this.initProject()
   },
   methods: {
+    formatterZt({cellValue}){
+      if(cellValue==='0'){
+        return '正常'
+      }
+      if(cellValue==='1'){
+        return '提前'
+      }
+      if (cellValue==='2'){
+        return '拖期'
+      }
+      return cellValue
+    },
     zx(){
       const data=this.$refs.yppfk0.getSelectQfxq();
       if (data.length==0){
diff --git a/src/views/jhzx/ydjhzxGL.vue b/src/views/jhzx/ydjhzxGL.vue
index a9fe61e..435d0ee 100644
--- a/src/views/jhzx/ydjhzxGL.vue
+++ b/src/views/jhzx/ydjhzxGL.vue
@@ -345,6 +345,9 @@ export default {
         { field: 'zt', title: '状态',width: 70,formatter: ['dictFormat','SYZT'],
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', }},
+        { field: 'jhlx', title: '计划类型',width: 70,formatter:this.formatterZt,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
         { field: 'gxsj', title: '数据更新时间',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', }},
@@ -927,6 +930,21 @@ export default {
     this.initBase()
   },
   methods: {
+    formatterZt({cellValue}){
+      if(cellValue==='0'){
+        return '正常'
+      }
+      if(cellValue==='1'){
+        return '提前'
+      }
+      if (cellValue==='2'){
+        return '拖期'
+      }
+      if (cellValue==='3'){
+        return '追加'
+      }
+      return cellValue
+    },
     tjydjh(){
 
       if (this.checkedList.length<1){
diff --git a/src/views/sjzx/gcrlWH.vue b/src/views/sjzx/gcrlWH.vue
index 429b00f..fbba75e 100644
--- a/src/views/sjzx/gcrlWH.vue
+++ b/src/views/sjzx/gcrlWH.vue
@@ -118,6 +118,16 @@ export default {
           align: "center",
           editRender: { name: "input" },
         },
+        {
+          field: "pb",
+          title: "排班",
+          align: "center",
+          editRender: {
+            name: "$select",
+            options: [],
+            props: { clearable: true },
+          },
+        },
       ],
       typeOption: [
         {
@@ -129,6 +139,20 @@ export default {
           label: "工作日",
         },
       ],
+      pbOption: [
+        {
+          value: "1",
+          label: "早班",
+        },
+        {
+          value: "2",
+          label: "晚班",
+        },
+        {
+          value: "3",
+          label: "双班",
+        },
+      ],
     };
   },
   computed: {
@@ -142,13 +166,17 @@ export default {
     this.request.nf = year;
     this.typeList();
     this.initList();
+
   },
   methods: {
     typeList() {
       this.$nextTick(() => {
         const tableRef = this.$refs.tableRef;
         const typeText = tableRef.getColumnByField("xxr");
+        const pbText = tableRef.getColumnByField("pb");
         typeText.editRender.options = this.typeOption;
+        pbText.editRender.options = this.pbOption;
+
       });
     },
     // 获取列表接口
diff --git a/src/views/sjzx/sbcnWH.vue b/src/views/sjzx/sbcnWH.vue
index 184f3b3..e4325b6 100644
--- a/src/views/sjzx/sbcnWH.vue
+++ b/src/views/sjzx/sbcnWH.vue
@@ -140,6 +140,10 @@ export default {
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
+        { field: 'degsYb', title: '定额工时(夜班)', width: 160,editRender: { name: "$input"},
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
         { field: 'sdgs', title: '实动工时(小时)', width: 160,editRender: { name: "$input"},
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
diff --git a/src/views/sjzx/sbjgryWH.vue b/src/views/sjzx/sbjgryWH.vue
index 9b752f4..f604235 100644
--- a/src/views/sjzx/sbjgryWH.vue
+++ b/src/views/sjzx/sbjgryWH.vue
@@ -58,12 +58,29 @@
                 mode: 'row',
                 showStatus: true,
               }"
-              :span-method="rowspanMethod"
               :scroll-y="{enabled: false}"
               highlight-hover-row
               @checkbox-all="selectAllEvent"
               @checkbox-change="selectChangeEvent"
             >
+              <template #sbbh_edit="{ row }">
+                <vxe-input
+                  v-model="row.sbbh"
+                  disabled
+                  placeholder=""
+                ></vxe-input>
+              </template>
+              <template #sbmc_edit="{ row }">
+                <vxe-select
+                  v-model="row.sbmc"
+                  :options="sbmcOptions"
+                  :disabled="row.sbmcDisabled"
+                  @change="changeSbmc($event, row)"
+                  placeholder=""
+                  clearable
+                  transfer
+                ></vxe-select>
+              </template>
             </vxe-grid>
           </div>
         </el-main>
@@ -75,7 +92,11 @@
 <script>
 import {
   getSbjgrys,
+  saveJgry,
+  updateJgry,
+  deleteJgry
 } from "@/api/sjzx/sbryWH";
+import {emSbjbbZM, getBMMCBM} from "@/api/sjzx/sbwxjhWH";
 export default {
   name: "SbjgryWH",
   data() {
@@ -105,14 +126,102 @@ export default {
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-        { field: 'xjsj', title: '休假时间', width: 160,
+        { field: 'xjsjKs', title: '休假开始时间', width: 160,
           editRender: { name: "$input",
-            props: { type: 'date',labelFormat:"yyyy/MM/dd",start:"2024/03/13" ,end:"2024/03/14"}
+            props: { type: 'date',labelFormat:"yyyy/MM/dd",valueFormat:"yyyy/MM/dd"}
           },
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-        { field: 'sb', title: '默认设备', width: 160,formatter:['dictFormat','PCGX'],
+        { field: 'xjsjJs', title: '休假结束时间', width: 160,
+          editRender: { name: "$input",
+            props: { type: 'date',labelFormat:"yyyy/MM/dd",valueFormat:"yyyy/MM/dd"}
+          },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        {
+          field: "szcs",
+          title: "所属部门",
+          align: "center",
+          minWidth: "110",
+          editRender: {
+            name: "$select",
+            options: [],
+            props: { clearable: true },
+            events: {
+              change: this.changeSzcs,
+            },
+          },
+          filters: [
+            {
+              data: {
+                checks: [],
+                sVal: "",
+                sMenu: "",
+                fType1: "",
+                fVal1: "",
+                fMode: "and",
+                fType2: "",
+                fVal2: "",
+              },
+            },
+          ],
+          filterRender: { name: "FilterCombination" },
+        },
+        {
+          field: "sbmc",
+          title: "默认设备",
+          align: "center",
+          minWidth: "110",
+          editRender: {
+            name: "$select",
+            options: [],
+            props: {
+              clearable: true,
+            },
+          },
+          slots: { edit: "sbmc_edit" },
+          filters: [
+            {
+              data: {
+                checks: [],
+                sVal: "",
+                sMenu: "",
+                fType1: "",
+                fVal1: "",
+                fMode: "and",
+                fType2: "",
+                fVal2: "",
+              },
+            },
+          ],
+          filterRender: { name: "FilterCombination" },
+        },
+        {
+          field: "sbbh",
+          title: "设备编号",
+          align: "center",
+          minWidth: "130",
+          editRender: { name: "input" },
+          slots: { edit: "sbbh_edit" },
+          filters: [
+            {
+              data: {
+                checks: [],
+                sVal: "",
+                sMenu: "",
+                fType1: "",
+                fVal1: "",
+                fMode: "and",
+                fType2: "",
+                fVal2: "",
+              },
+            },
+          ],
+          filterRender: { name: "FilterCombination" },
+        },
+        { field: 'zt', title: '状态', width: 160,formatter:['dictFormat','YGZT'],
           editRender: {
             name: "$select",
             options: [],
@@ -121,7 +230,7 @@ export default {
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-        { field: 'zt', title: '状态', width: 160,formatter:['dictFormat','PCGX'],
+        { field: 'gz', title: '工种', width: 160,formatter:['dictFormat','RYGX'],
           editRender: {
             name: "$select",
             options: [],
@@ -132,16 +241,7 @@ export default {
         },
   ],
       gxOptions: [],
-      ztOptions: [
-        {
-          label: '在职',
-          value: 0,
-        },
-        {
-          label: '离职',
-          value: 1,
-        },
-      ],
+
       departmentOptions: [],
       options: [],
       sbmcOptions: [],
@@ -150,23 +250,65 @@ export default {
   },
   created() {
     window.addEventListener("resize", this.getHeight);
+
     this.getHeight();
     this.initList();
     this.initgxList();
-    // this.emSbjbbZM("QGKW");
-    // this.emSbjbbZM("bmbm");
-    // this.getBMMCBM();
+    this.getBMMCBM();
+    this.emSbjbbZM("bmbm");
+
 
   },
   methods: {
+    // 部门对应设备名称和编号
+    getBMMCBM() {
+      getBMMCBM().then((res) => {
+        if (res.success) {
+          this.options = res.data;
+        }
+      });
+    },
+    // 设备信息转码接口
+    emSbjbbZM(params) {
+      emSbjbbZM({
+        bmlb: params,
+      }).then((res) => {
+        const tableRef = this.$refs.tableRef;
+        if (params == "bmbm") {
+          // 所属部门
+          this.departmentOptions = res.data;
+          const sbztText = tableRef.getColumnByField("szcs");
+          const testList = [];
+          Object.keys(this.options).forEach((item) => {
+            for (let i = 0; i < this.departmentOptions.length; i++) {
+              if (item == this.departmentOptions[i].bm) {
+                const temp = {
+                  label: this.departmentOptions[i].bmsm,
+                  value: this.departmentOptions[i].bm,
+                };
+                testList.push(temp);
+              }
+            }
+            sbztText.editRender.options = testList;
+          });
+        }
+      });
+    },
     initgxList(){
       const dict=window.localStorage.getItem( 'PCGX');
+      const ztDict=window.localStorage.getItem( 'YGZT');
+      const gzDict=window.localStorage.getItem( 'RYGX');
       const gxList =JSON.parse(dict)
+      const ztList =JSON.parse(ztDict)
+      const gzList =JSON.parse(gzDict)
         this.$nextTick(() => {
           const tableRef = this.$refs.tableRef;
           const gx = tableRef.getColumnByField("gx");
           const zt = tableRef.getColumnByField("zt");
+          const gz = tableRef.getColumnByField("gz");
           const testList = [];
+          const ztList1 = [];
+          const gzList1 = [];
           for (let i = 0; i < gxList.length; i++) {
             const temp = {
               label: gxList[i].bmsm,
@@ -174,9 +316,24 @@ export default {
             };
             testList.push(temp);
           }
+          for (let i = 0; i < ztList.length; i++) {
+            const temp = {
+              label: ztList[i].bmsm,
+              value: ztList[i].bm,
+            };
+            ztList1.push(temp);
+          }
+          for (let i = 0; i < gzList.length; i++) {
+            const temp = {
+              label: gzList[i].bmsm,
+              value: gzList[i].bm,
+            };
+            gzList1.push(temp);
+          }
           this.gxOptions= testList;
           gx.editRender.options = testList;
-          zt.editRender.options = this.ztOptions;
+          zt.editRender.options = ztList1;
+          gz.editRender.options = gzList1;
         });
 
     },
@@ -187,48 +344,14 @@ export default {
         this.checkedList = [];
       });
     },
-    // 部门对应设备名称和编号
-    getBMMCBM() {
-      getBMMCBM().then((res) => {
-        if (res.success) {
-          this.options = res.data;
-        }
-      });
-    },
-
-    // 设备信息转码接口
-    emSbjbbZM(params) {
-      emSbjbbZM({
-        bmlb: params,
-      }).then((res) => {
-        const tableRef = this.$refs.tableRef;
-        if (params == "bmbm") {
-          // 所属部门
-          this.departmentOptions = res.data;
-          const sbztText = tableRef.getColumnByField("szcs");
-          const testList = [];
-          for (let i = 0; i < this.departmentOptions.length; i++) {
-            const temp = {
-              label: this.departmentOptions[i].bmsm,
-              value: this.departmentOptions[i].bm,
-            };
-            testList.push(temp);
-          }
-          sbztText.editRender.options = testList;
-        }
-      });
-    },
-
     // 监听选择所属部门
     changeSzcs(row, id) {
-      console.log(row, id);
       if (row.row.szcs) {
         row.row.sbmcDisabled = false;
         row.row.sbmc = "";
         row.row.sbbh = "";
         this.sbmcOptions = [];
         const testList = [];
-        console.log(this.options, "======");
         for (let i = 0; i < this.options[id.value].length; i++) {
           const temp = {
             label: this.options[id.value][i].sbmc,
@@ -294,15 +417,11 @@ export default {
               // 新增
               if (insertRecords.length !== 0) {
                 for(let i = 0; i < insertRecords.length; i++){
-                  if(insertRecords[i].tzbh === undefined || insertRecords[i].tzbh === "" || insertRecords[i].tzbh === null){
+                  if(insertRecords[i].dlzh === undefined || insertRecords[i].dlzh === "" || insertRecords[i].dlzh === null){
                     flag = true;
                     break;
                   }
-                  if(insertRecords[i].zl === undefined || insertRecords[i].zl === "" || insertRecords[i].zl === null){
-                    flag = true;
-                    break;
-                  }
-                  if(insertRecords[i].jgsx === undefined || insertRecords[i].jgsx === "" || insertRecords[i].jgsx === null){
+                  if(insertRecords[i].employeeNumber === undefined || insertRecords[i].employeeNumber === "" || insertRecords[i].employeeNumber === null){
                     flag = true;
                     break;
                   }
@@ -310,11 +429,7 @@ export default {
                     flag = true;
                     break;
                   }
-                  if(insertRecords[i].jldw === undefined || insertRecords[i].jldw === "" || insertRecords[i].jldw === null){
-                    flag = true;
-                    break;
-                  }
-                  if(insertRecords[i].degs === undefined || insertRecords[i].degs === "" || insertRecords[i].degs === null){
+                  if(insertRecords[i].zt === undefined || insertRecords[i].zt === "" || insertRecords[i].zt === null){
                     flag = true;
                     break;
                   }
@@ -322,7 +437,7 @@ export default {
                 if(flag){
                   this.$message.error({message:"新增内容未达到可保存标准，请把必要信息空白补全。"})
                 }else{
-                save(insertRecords).then((res) => {
+                saveJgry(insertRecords).then((res) => {
                   if (res.success) {
                     this.list = this.list.concat(insertRecords);
                     const xTable = this.$refs.tableRef;
@@ -338,15 +453,11 @@ export default {
               //  修改
               if (updateRecords.length !== 0) {
                 for(let i = 0; i < insertRecords.length; i++){
-                  if(insertRecords[i].tzbh === undefined || insertRecords[i].tzbh === "" || insertRecords[i].tzbh === null){
+                  if(insertRecords[i].dlzh === undefined || insertRecords[i].dlzh === "" || insertRecords[i].dlzh === null){
                     flag = true;
                     break;
                   }
-                  if(insertRecords[i].zl === undefined || insertRecords[i].zl === "" || insertRecords[i].zl === null){
-                    flag = true;
-                    break;
-                  }
-                  if(insertRecords[i].jgsx === undefined || insertRecords[i].jgsx === "" || insertRecords[i].jgsx === null){
+                  if(insertRecords[i].employeeNumber === undefined || insertRecords[i].employeeNumber === "" || insertRecords[i].employeeNumber === null){
                     flag = true;
                     break;
                   }
@@ -354,11 +465,7 @@ export default {
                     flag = true;
                     break;
                   }
-                  if(insertRecords[i].jldw === undefined || insertRecords[i].jldw === "" || insertRecords[i].jldw === null){
-                    flag = true;
-                    break;
-                  }
-                  if(insertRecords[i].degs === undefined || insertRecords[i].degs === "" || insertRecords[i].degs === null){
+                  if(insertRecords[i].zt === undefined || insertRecords[i].zt === "" || insertRecords[i].zt === null){
                     flag = true;
                     break;
                   }
@@ -366,7 +473,7 @@ export default {
                 if(flag){
                   this.$message.error({message:"保存内容未达到可保存标准，请把必要信息空白补全。"})
                 }else{
-                  update(updateRecords).then((res) => {
+                  updateJgry(updateRecords).then((res) => {
                     if (res.success) {
                       const xTable = this.$refs.tableRef;
                       xTable.loadData(this.initList());
@@ -380,7 +487,7 @@ export default {
           }
           // 删除
           if (removeRecords.length !== 0) {
-            delete1(removeRecords).then((res) => {
+            deleteJgry(removeRecords).then((res) => {
               if (res.success) {
                 for (let i = 0; i < this.list.length; i++) {
                   if (removeRecords.indexOf(this.list[i]) !== -1) {
@@ -394,51 +501,9 @@ export default {
               }
             });
           }
-
-          // if (removeRecords.length !== 0) {
-          //   this.$message(
-          //     `新增 ${insertRecords.length} 条，删除 ${removeRecords.length} 条，更新 ${updateRecords.length} 条`
-          //   );
-          // } else {
-          //   const valid = this.$refs.tableRef;
-          //   if (valid) {
-          //     const errMap = await valid.validate(true);
-          //     if (errMap) {
-          //       return false;
-          //     } else {
-          //       this.$message(
-          //         `新增 ${insertRecords.length} 条，删除 ${removeRecords.length} 条，更新 ${updateRecords.length} 条`
-          //       );
-          //     }
-          //   }
-          // }
           break;
       }
     },
-    //合并行
-    rowspanMethod({row, _rowIndex, column, visibleData}) {
-      //不要忘记在vxe-grid上配置  :scroll-y="{enabled: false}" 防止下拉时样式变化
-      // 需要合并的列字段
-      let fields = ['tzbh'];// 需要合并的列
-      const cellValue = row[column.property];// 合并行的相同的唯一标识
-      if (cellValue && fields.includes(column.property)) {
-        const prevRow = visibleData[_rowIndex - 1];
-        let nextRow = visibleData[_rowIndex + 1];
-        if (prevRow && prevRow[column.property] === cellValue) {
-          // 如果和第一行数据一样，就删除
-          return {rowspan: 0, colspan: 0};
-        } else {
-          // 获取有机会数据是一样的
-          let countRowspan = 1;
-          while (nextRow && nextRow[column.property] === cellValue) {
-            nextRow = visibleData[++countRowspan + _rowIndex];
-          }
-          if (countRowspan > 1) {
-            return {rowspan: countRowspan, colspan: 1};
-          }
-        }
-      }
-    },
     getHeight() {
       this.height = window.innerHeight - 160;
     },
diff --git a/src/views/sjzx/sbxxWH.vue b/src/views/sjzx/sbxxWH.vue
index e4a2f7b..d7e3527 100644
--- a/src/views/sjzx/sbxxWH.vue
+++ b/src/views/sjzx/sbxxWH.vue
@@ -49,9 +49,9 @@
 <!--            <el-button type="danger" @click="toolbarButtonClickEvent('delete')"-->
 <!--              >删除</el-button-->
 <!--            >-->
-<!--            <el-button type="primary" @click="toolbarButtonClickEvent('save')"-->
-<!--              >保存</el-button-->
-<!--            >-->
+            <el-button type="primary" @click="toolbarButtonClickEvent('save')"
+              >保存</el-button
+            >
           </el-col>
         </el-row>
       </el-form>
@@ -66,6 +66,7 @@
               border
               resizable
               keep-source
+              show-overflow
               :height="height"
               :auto-resize="true"
               :columns="tableColumn"
@@ -82,53 +83,7 @@
               @checkbox-all="selectAllEvent"
               @checkbox-change="selectChangeEvent"
             >
-              <template #sbbh_edit="{ row }">
-                <vxe-input
-                  v-model="row.sbbh"
-                  :disabled="row.sbbhDisabled"
-                ></vxe-input>
-              </template>
-              <template #zdry_edit="{ row }">
-                <vxe-input
-                  v-model="row.zdry"
-                  placeholder=""
-                  :disabled="zdDisabled"
-                ></vxe-input>
-              </template>
-              <template #zdsj_edit="{ row }">
-                <vxe-input
-                  v-model="row.zdsj"
-                  placeholder=""
-                  :disabled="zdDisabled"
-                ></vxe-input>
-              </template>
-              <template #ccrq_edit="{ row }">
-                <vxe-input
-                  v-model="row.ccrq"
-                  type="date"
-                  value-format="yyyy/MM/dd"
-                  placeholder=""
-                  transfer
-                ></vxe-input>
-              </template>
-              <template #grrq_edit="{ row }">
-                <vxe-input
-                  v-model="row.grrq"
-                  type="date"
-                  value-format="yyyy/MM/dd"
-                  placeholder=""
-                  transfer
-                ></vxe-input>
-              </template>
-              <template #lgrq_edit="{ row }">
-                <vxe-input
-                  v-model="row.lgrq"
-                  type="date"
-                  value-format="yyyy/MM/dd"
-                  placeholder=""
-                  transfer
-                ></vxe-input>
-              </template>
+
             </vxe-grid>
           </div>
         </el-main>
@@ -153,7 +108,7 @@ export default {
   data() {
     return {
       request: {
-        sbbh: "",
+        sbbh: '',
         szcs: "",
         gysbm: "",
       },
@@ -173,8 +128,6 @@ export default {
           field: "sbbh",
           title: "设备编号",
           align: "center",
-          editRender: { name: "input" },
-          slots: { edit: "sbbh_edit" },
           minWidth: "120",
           filters: [
             {
@@ -196,7 +149,6 @@ export default {
           field: "sbmc",
           title: "设备名称",
           align: "center",
-          editRender: { name: "input" },
           minWidth: "110",
           filters: [
             {
@@ -218,7 +170,6 @@ export default {
           field: "sbxh",
           title: "设备型号",
           align: "center",
-          editRender: { name: "input" },
           minWidth: "110",
           filters: [
             {
@@ -240,7 +191,6 @@ export default {
           field: "sbgg",
           title: "设备规格",
           align: "center",
-          editRender: { name: "input" },
           minWidth: "110",
           filters: [
             {
@@ -262,11 +212,7 @@ export default {
           field: "jldw",
           title: "计量单位",
           align: "center",
-          editRender: {
-            name: "$select",
-            options: [],
-            props: { clearable: true },
-          },
+          formatter:['dictFormat','JLDW'],
           minWidth: "110",
           filters: [
             {
@@ -288,12 +234,8 @@ export default {
           field: "szcs",
           title: "所属部门",
           align: "center",
-          editRender: {
-            name: "$select",
-            options: [],
-            props: { clearable: true },
-          },
           minWidth: "110",
+          formatter:['dictFormat','BMBM'],
           filters: [
             {
               data: {
@@ -314,12 +256,8 @@ export default {
           field: "sbzt",
           title: "固定资产状态",
           align: "center",
-          editRender: {
-            name: "$select",
-            options: [],
-            props: { clearable: true },
-          },
           minWidth: "120",
+          formatter:['dictFormat','SBZT'],
           filters: [
             {
               data: {
@@ -363,8 +301,65 @@ export default {
           filterRender: { name: "FilterCombination" },
         },
         {
-          field: "whsj",
-          title: "维护时间范围",
+          field: "whsj1",
+          title: "维护开始时间",
+          align: "center",
+          editRender: {
+            name: '$input',
+            props:{type:"date" ,
+              valueFormat:"yyyy/MM/dd",labelFormat:"yyyy/MM/dd",clearable: true,},
+            events: {
+              change: this.changeWhsj1
+            },},
+          formatter: this.whsj1,
+          minWidth: "150",
+          filters: [
+            {
+              data: {
+                checks: [],
+                sVal: "",
+                sMenu: "",
+                fType1: "",
+                fVal1: "",
+                fMode: "and",
+                fType2: "",
+                fVal2: "",
+              },
+            },
+          ],
+          filterRender: { name: "FilterCombination" },
+        },
+        {
+          field: "whsj2",
+          title: "维护结束时间",
+          align: "center",
+          editRender: { name:  '$input',
+            props:{type:"date" ,valueFormat:"yyyy/MM/dd",labelFormat:"yyyy/MM/dd",clearable: true,},
+            events: {
+              change: this.changeWhsj2
+            },
+          },
+          formatter: this.whsj2,
+          minWidth: "150",
+          filters: [
+            {
+              data: {
+                checks: [],
+                sVal: "",
+                sMenu: "",
+                fType1: "",
+                fVal1: "",
+                fMode: "and",
+                fType2: "",
+                fVal2: "",
+              },
+            },
+          ],
+          filterRender: { name: "FilterCombination" },
+        },
+        {
+          field: "xqrs",
+          title: "默认人数",
           align: "center",
           editRender: { name: "input" },
           minWidth: "110",
@@ -385,9 +380,10 @@ export default {
           filterRender: { name: "FilterCombination" },
         },
         {
-          field: "sbfl",
-          title: "设备大类",
+          field: "gz",
+          title: "工种",
           align: "center",
+          formatter:['dictFormat','RYGX'],
           editRender: {
             name: "$select",
             options: [],
@@ -410,15 +406,33 @@ export default {
           ],
           filterRender: { name: "FilterCombination" },
         },
+        {
+          field: "sbfl",
+          title: "设备大类",
+          align: "center",
+          formatter: this.formatterFl1,
+          minWidth: "110",
+          filters: [
+            {
+              data: {
+                checks: [],
+                sVal: "",
+                sMenu: "",
+                fType1: "",
+                fVal1: "",
+                fMode: "and",
+                fType2: "",
+                fVal2: "",
+              },
+            },
+          ],
+          filterRender: { name: "FilterCombination" },
+        },
         {
           field: "sbzl",
           title: "设备中类",
           align: "center",
-          editRender: {
-            name: "$select",
-            options: [],
-            props: { clearable: true },
-          },
+          formatter: this.formatterFl2,
           minWidth: "110",
           filters: [
             {
@@ -440,11 +454,7 @@ export default {
           field: "sbxl",
           title: "设备小类",
           align: "center",
-          editRender: {
-            name: "$select",
-            options: [],
-            props: { clearable: true },
-          },
+          formatter: this.formatterFl3,
           minWidth: "110",
           filters: [
             {
@@ -466,8 +476,6 @@ export default {
           field: "grrq",
           title: "购入日期",
           align: "center",
-          editRender: { name: "input" },
-          slots: { edit: "grrq_edit" },
           minWidth: "110",
           filters: [
             {
@@ -489,7 +497,6 @@ export default {
           field: "sbjg",
           title: "设备原值",
           align: "center",
-          editRender: { name: "input" },
           minWidth: "110",
           filters: [
             {
@@ -511,7 +518,6 @@ export default {
           field: "sbcz",
           title: "设备残值",
           align: "center",
-          editRender: { name: "input" },
           minWidth: "110",
           filters: [
             {
@@ -533,7 +539,6 @@ export default {
           field: "gysbm",
           title: "供应商",
           align: "center",
-          editRender: { name: "input" },
           minWidth: "100",
           filters: [
             {
@@ -555,7 +560,6 @@ export default {
           field: "cd",
           title: "产地",
           align: "center",
-          editRender: { name: "input" },
           minWidth: "90",
           filters: [
             {
@@ -578,7 +582,6 @@ export default {
           field: "zzdw",
           title: "制造单位",
           align: "center",
-          editRender: { name: "input" },
           minWidth: "110",
           filters: [
             {
@@ -601,7 +604,6 @@ export default {
           field: "ccbh",
           title: "出厂编号",
           align: "center",
-          editRender: { name: "input" },
           minWidth: "110",
           filters: [
             {
@@ -624,8 +626,6 @@ export default {
           field: "ccrq",
           title: "出厂日期",
           align: "center",
-          editRender: { name: "input" },
-          slots: { edit: "ccrq_edit" },
           minWidth: "110",
           filters: [
             {
@@ -647,8 +647,6 @@ export default {
           field: "lgrq",
           title: "列固日期",
           align: "center",
-          editRender: { name: "input" },
-          slots: { edit: "lgrq_edit" },
           minWidth: "110",
           filters: [
             {
@@ -671,7 +669,6 @@ export default {
           field: "tzsb",
           title: "特种设备",
           align: "center",
-          editRender: { name: "input" },
           minWidth: "110",
           filters: [
             {
@@ -693,7 +690,6 @@ export default {
           field: "edsynx",
           title: "额定使用年限",
           align: "center",
-          editRender: { name: "input" },
           minWidth: "130",
           filters: [
             {
@@ -715,7 +711,6 @@ export default {
           field: "edsysj",
           title: "额定使用时间",
           align: "center",
-          editRender: { name: "input" },
           minWidth: "130",
           filters: [
             {
@@ -737,7 +732,6 @@ export default {
           field: "edsysjdw",
           title: "额定使用时间单位",
           align: "center",
-          editRender: { name: "input" },
           minWidth: "150",
           filters: [
             {
@@ -760,7 +754,6 @@ export default {
           field: "gldw",
           title: "额定功率单位",
           align: "center",
-          editRender: { name: "input" },
           minWidth: "130",
           filters: [
             {
@@ -782,7 +775,6 @@ export default {
           field: "wxcc",
           title: "外形尺寸",
           align: "center",
-          editRender: { name: "input" },
           minWidth: "110",
           filters: [
             {
@@ -804,7 +796,6 @@ export default {
           field: "azwz",
           title: "安装位置",
           align: "center",
-          editRender: { name: "input" },
           minWidth: "110",
           filters: [
             {
@@ -826,7 +817,6 @@ export default {
           field: "jyxx",
           title: "检验信息",
           align: "center",
-          editRender: { name: "input" },
           minWidth: "110",
           filters: [
             {
@@ -844,13 +834,10 @@ export default {
           ],
           filterRender: { name: "FilterCombination" },
         },
-
         {
           field: "zdry",
           title: "制单人",
           align: "center",
-          editRender: { name: "input" },
-          slots: { edit: "zdry_edit" },
           minWidth: "100",
           filters: [
             {
@@ -872,8 +859,6 @@ export default {
           field: "zdsj",
           title: "制单日期",
           align: "center",
-          editRender: { name: "input" },
-          slots: { edit: "zdsj_edit" },
           minWidth: "110",
           filters: [
             {
@@ -895,7 +880,6 @@ export default {
           field: "sbkgnl",
           title: "设备能力",
           align: "center",
-          editRender: { name: "input" },
           minWidth: "110",
           filters: [
             {
@@ -917,7 +901,6 @@ export default {
           field: "gdzcbh",
           title: "固定资产编号",
           align: "center",
-          editRender: { name: "input" },
           minWidth: "130",
           filters: [
             {
@@ -939,7 +922,6 @@ export default {
           field: "zjnx",
           title: "折旧年限",
           align: "center",
-          editRender: { name: "input" },
           minWidth: "110",
           filters: [
             {
@@ -961,7 +943,6 @@ export default {
           field: "bz",
           title: "备注",
           align: "center",
-          editRender: { name: "input" },
           minWidth: "90",
           filters: [
             {
@@ -983,7 +964,6 @@ export default {
           field: "czry",
           title: "操作者",
           align: "center",
-          editRender: { name: "input" },
           minWidth: "90",
           filters: [
             {
@@ -1027,6 +1007,7 @@ export default {
     this.emSbjbbZM("sbyxzt");
     this.emSbjbbZM("bmbm");
     this.initList();
+    this.initgzList();
   },
   computed: {
     ...mapGetters([
@@ -1037,6 +1018,7 @@ export default {
     // 获取列表接口
     initList() {
       getList(this.request).then((res) => {
+
         this.list = res.data;
         this.checkedList = [];
         if (this.list > 0) {
@@ -1047,6 +1029,23 @@ export default {
         }
       });
     },
+    initgzList(){
+      const gzDict=window.localStorage.getItem( 'RYGX');
+      const gzList =JSON.parse(gzDict)
+      this.$nextTick(() => {
+        const tableRef = this.$refs.tableRef;
+        const gz = tableRef.getColumnByField("gz");
+        const gzList1 = [];
+        for (let i = 0; i < gzList.length; i++) {
+          const temp = {
+            label: gzList[i].bmsm,
+            value: gzList[i].bm,
+          };
+          gzList1.push(temp);
+        }
+        gz.editRender.options = gzList1;
+      });
+    },
     //   获取供应商接口
     getGYS() {
       getGYS().then((res) => {
@@ -1061,29 +1060,81 @@ export default {
           };
           testList.push(temp);
         }
-        gysbmText.editRender.options = testList;
+        // gysbmText.editRender.options = testList;
       });
     },
-    // 获取设备分类接口
+    formatterFl1({ cellValue }) {
+      for (let i = 0; i < this.typeList.length; i++) {
+        if (this.typeList[i].bmjb==='1' && this.typeList[i].bm===cellValue){
+          return this.typeList[i].bmsm
+        }
+      }
+      return cellValue
+    },
+    whsj1({ row }) {
+      if (row.whsj){
+        return row.whsj.substring(0,10)
+      }
+      return ''
+    },
+    whsj2({ row }) {
+      if (row.whsj){
+        return row.whsj.substring(11,21)
+      }
+      return  ''
+    },
+    formatterFl2({ cellValue }) {
+      for (let i = 0; i < this.typeList.length; i++) {
+        if (this.typeList[i].bmjb==='2' && this.typeList[i].bm===cellValue){
+          return this.typeList[i].bmsm
+        }
+      }
+      return cellValue
+    },
+    formatterFl3({ cellValue }) {
+      for (let i = 0; i < this.typeList.length; i++) {
+        if (this.typeList[i].bmjb==='3' && this.typeList[i].bm===cellValue){
+          return this.typeList[i].bmsm
+        }
+      }
+      return cellValue
+    },
     getSBLX() {
       getSBLX().then((res) => {
         this.typeList = res.data;
-        const tableRef = this.$refs.tableRef;
-        const sbzlText = tableRef.getColumnByField("sbzl");
-        const sbflText = tableRef.getColumnByField("sbfl");
-        const sbxlText = tableRef.getColumnByField("sbxl");
-        const testList = [];
-        for (let i = 0; i < this.typeList.length; i++) {
-          const temp = {
-            label: this.typeList[i].bmsm,
-            value: this.typeList[i].bm,
-          };
-          testList.push(temp);
+      })
+    },
+    changeWhsj1({ row, rowIndex }){
+      if(row.whsj1){
+        if(!row.whsj){
+          row.whsj=row.whsj1+'_'+row.whsj1
+          row.whsj2=row.whsj1
+        }else {
+          var whsj2=row.whsj.substring(11,21)
+          if(row.whsj1>whsj2 ){
+            row.whsj=row.whsj1+'_'+row.whsj1
+            row.whsj2=row.whsj1
+          }else {
+            row.whsj=row.whsj1+'_'+whsj2
+          }
         }
-        sbzlText.editRender.options = testList;
-        sbflText.editRender.options = testList;
-        sbxlText.editRender.options = testList;
-      });
+      }
+    },
+    changeWhsj2({ row, rowIndex }){
+      if(row.whsj2){
+        if(!row.whsj){
+          row.whsj=row.whsj2+'_'+row.whsj2
+          row.whsj1=row.whsj2
+        }else {
+          var whsj1=row.whsj.substring(0,10)
+          if(whsj1>row.whsj2 ){
+            row.whsj=row.whsj2+'_'+row.whsj2
+            row.whsj1=row.whsj2
+          }else {
+            row.whsj=whsj1+'_'+row.whsj2
+          }
+        }
+      }
     },
     // 设备信息转码接口
     emSbjbbZM(params) {
@@ -1092,44 +1143,44 @@ export default {
       }).then((res) => {
         const tableRef = this.$refs.tableRef;
         if (params == "jldw") {
-          // 计量单位
-          const list = res.data;
-          const sbztText = tableRef.getColumnByField("jldw");
-          const testList = [];
-          for (let i = 0; i < list.length; i++) {
-            const temp = {
-              label: list[i].bmsm,
-              value: list[i].bm,
-            };
-            testList.push(temp);
-          }
-          sbztText.editRender.options = testList;
-        } else if (params == "sbzt") {
+      //     // 计量单位
+      //     const list = res.data;
+      //     const sbztText = tableRef.getColumnByField("jldw");
+      //     const testList = [];
+      //     for (let i = 0; i < list.length; i++) {
+      //       const temp = {
+      //         label: list[i].bmsm,
+      //         value: list[i].bm,
+      //       };
+      //       testList.push(temp);
+      //     }
+      //     sbztText.editRender.options = testList;
+      //   } else if (params == "sbzt") {
           // 设备状态
-          const list = res.data;
-          const sbztText = tableRef.getColumnByField("sbzt");
-          const testList = [];
-          for (let i = 0; i < list.length; i++) {
-            const temp = {
-              label: list[i].bmsm,
-              value: list[i].bm,
-            };
-            testList.push(temp);
-          }
-          sbztText.editRender.options = testList;
+          // const list = res.data;
+          // const sbztText = tableRef.getColumnByField("sbzt");
+          // const testList = [];
+          // for (let i = 0; i < list.length; i++) {
+          //   const temp = {
+          //     label: list[i].bmsm,
+          //     value: list[i].bm,
+          //   };
+          //   testList.push(temp);
+          // }
+          // sbztText.editRender.options = testList;
         } else if (params == "bmbm") {
-          // 所属部门
+      //     // 所属部门
           this.departmentOptions = res.data;
-          const sbztText = tableRef.getColumnByField("szcs");
-          const testList = [];
-          for (let i = 0; i < this.departmentOptions.length; i++) {
-            const temp = {
-              label: this.departmentOptions[i].bmsm,
-              value: this.departmentOptions[i].bm,
-            };
-            testList.push(temp);
-          }
-          sbztText.editRender.options = testList;
+      //     const sbztText = tableRef.getColumnByField("szcs");
+      //     const testList = [];
+      //     for (let i = 0; i < this.departmentOptions.length; i++) {
+      //       const temp = {
+      //         label: this.departmentOptions[i].bmsm,
+      //         value: this.departmentOptions[i].bm,
+      //       };
+      //       testList.push(temp);
+      //     }
+      //     sbztText.editRender.options = testList;
         }else if (params == "sbyxzt") {
           const sbyxztText = tableRef.getColumnByField("sbyxzt");
           const testList = [];
@@ -1217,6 +1268,7 @@ export default {
 
               //  修改
               if (updateRecords.length !== 0) {
+
                 update(updateRecords).then((res) => {
                   if (res.success) {
                     const xTable = this.$refs.tableRef;