月工时信息展示、验收传值更改

@@ -315,10 +315,10 @@ export const JeecgListMixin = {
     },
     },
     // 根据月份和姓名查看工序
     // 根据月份和姓名查看工序
     querygxone: function (record) {
     querygxone: function (record) {
-      console.log("月份：",record.salaryMonth)
-      console.log("姓名：",record.name)
+      console.log("月份：",record.yanTime)
+      console.log("姓名：",record.undertaker)
       this.$refs.modalForm.edit(record);
       this.$refs.modalForm.edit(record);
-      this.$refs.modalForm.queryGxOne(record.salaryMonth,record.name);
+      this.$refs.modalForm.queryGxOne(record.yanTime,record.undertaker);
       this.$refs.modalForm.title = "工序查看";
       this.$refs.modalForm.title = "工序查看";
       this.$refs.modalForm.disableSubmit = true;
       this.$refs.modalForm.disableSubmit = true;
     },
     },

@@ -204,6 +204,8 @@ export default {
             }
             }
             return acc
             return acc
           }, [])
           }, [])
+          console.log("recordsToUpdate：",recordsToUpdate)
+          if(recordsToUpdate.length>0){
             updateYan(this.url.updateYan, recordsToUpdate)
             updateYan(this.url.updateYan, recordsToUpdate)
             .then((res) => {
             .then((res) => {
               if (res.success) {
               if (res.success) {
@@ -216,6 +218,11 @@ export default {
             .finally(() => {
             .finally(() => {
               that.confirmLoading = false
               that.confirmLoading = false
             })
             })
+          }else{
+            this.confirmLoading = false
+            this.visible = false;
+          }
+          
         }
         }
       })
       })
     },
     },

@@ -6,7 +6,7 @@
         <a-row :gutter="24">
         <a-row :gutter="24">
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="姓名">
             <a-form-item label="姓名">
-              <j-input placeholder="请输入姓名" v-model="queryParam.name"></j-input>
+              <a-input placeholder="请输入姓名" v-model="queryParam.name"></a-input>
             </a-form-item>
             </a-form-item>
           </a-col>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -145,7 +145,7 @@
           {
           {
             title:'月份',
             title:'月份',
             align:"center",
             align:"center",
-            dataIndex: 'salaryMonth',
+            dataIndex: 'yanTime',
             customRender:function (text) {
             customRender:function (text) {
               return !text?"":(text.length>10?text.substr(0,10):text)
               return !text?"":(text.length>10?text.substr(0,10):text)
             }
             }
@@ -153,12 +153,12 @@
           {
           {
             title:'姓名',
             title:'姓名',
             align:"center",
             align:"center",
-            dataIndex: 'name'
+            dataIndex: 'undertaker'
           },
           },
           {
           {
             title:'月总工时',
             title:'月总工时',
             align:"center",
             align:"center",
-            dataIndex: 'workTime'
+            dataIndex: 'workHours'
           },
           },
           {
           {
             title: '操作',
             title: '操作',
@@ -170,11 +170,11 @@
           }
           }
         ],
         ],
         url: {
         url: {
-          list: "/work_time/tblWorkTime/list",
-          delete: "/work_time/tblWorkTime/delete",
-          deleteBatch: "/work_time/tblWorkTime/deleteBatch",
-          exportXlsUrl: "/work_time/tblWorkTime/exportXls",
-          importExcelUrl: "work_time/tblWorkTime/importExcel",
+          list: "/work_time/viewWorkTime/list",
+          delete: "/work_time/viewWorkTime/delete",
+          deleteBatch: "/work_time/viewWorkTime/deleteBatch",
+          exportXlsUrl: "/work_time/viewWorkTime/exportXls",
+          importExcelUrl: "/work_time/viewWorkTime/importExcel",
           
           
         },
         },
         dictOptions:{},
         dictOptions:{},

@@ -99,9 +99,9 @@ import { queryGxOne } from '../../../api/manage'
         validatorRules: {
         validatorRules: {
         },
         },
         url: {
         url: {
-          add: "/work_time/tblWorkTime/add",
-          edit: "/work_time/tblWorkTime/edit",
-          queryById: "/work_time/tblWorkTime/queryById",
+          add: "/work_time/viewWorkTime/add",
+          edit: "/work_time/viewWorkTime/edit",
+          queryById: "/work_time/viewWorkTime/queryById",
           querygxone:"/production/tblProductionPlan/querygxone"
           querygxone:"/production/tblProductionPlan/querygxone"
         }
         }
       }
       }
@@ -123,7 +123,7 @@ import { queryGxOne } from '../../../api/manage'
         this.model = Object.assign({}, record);
         this.model = Object.assign({}, record);
         this.visible = true;
         this.visible = true;
       },
       },
-      queryGxOne(salaryMonth,name){
+      queryGxOne(yanTime,undertaker){
         queryGxOne(this.url.querygxone,this.model).then((res) =>{
         queryGxOne(this.url.querygxone,this.model).then((res) =>{
           this.res=res.result
           this.res=res.result
         })
         })

@@ -41,10 +41,10 @@
           this.$refs.realForm.edit(record);
           this.$refs.realForm.edit(record);
         })
         })
       },
       },
-      queryGxOne (salaryMonth,name) {
+      queryGxOne (yanTime,undertaker) {
         this.visible=true
         this.visible=true
         this.$nextTick(()=>{
         this.$nextTick(()=>{
-          this.$refs.realForm.queryGxOne(salaryMonth,name);
+          this.$refs.realForm.queryGxOne(yanTime,undertaker);
         })
         })
       },
       },
       close () {
       close () {