注释控制台打印语句

雷海东
src/mixins/JeecgListMixin.js
src/views/bidding_info/modules/TblBiddingShenqApproval1Model.vue
src/views/bidding_info/modules/TblBiddingShenqApproval2Model.vue
src/views/bidding_info/modules/TblBiddingShenqForm.vue
src/views/order_form/TblOrderFormList.vue
src/views/order_form/modules/TblOrderFormModal.vue
src/views/payroll/TblSalaryCalculationList.vue
src/views/payroll/basemodules/TblSalaryBaseForm.vue
src/views/production/planModules/TblProductionAddpgForm.vue
src/views/production/planModules/TblProductionPlanForm.vue
src/views/production/planModules/TblProductionYansForm.vue
src/views/productionProcess/modules/BiddingSqFormModal.vue
src/views/trad/modules/base/TblTradBaseForm.vue
src/views/trad/modules/contract/TblTradContractForm.vue
src/views/trad/modules/fphk/TblTradFphkForm.vue
src/views/trad/modules/inquiry/TblTradInquiryForm.vue
src/views/trad/modules/tender/TblTradTenderForm.vue
src/views/trad/modules/tou/TblTradTouForm.vue
src/views/work_time/TblWorkTimeList.vue
--- a/src/mixins/JeecgListMixin.js
查看文件 @3007797
+++ b/src/mixins/JeecgListMixin.js
查看文件 @3007797
@@ -251,7 +251,6 @@ export const JeecgListMixin = {
     },
     handleEdit: function (record) {
-      console.log(record)
       this.$refs.modalForm.edit(record);
       this.$refs.modalForm.title = "编辑";
       this.$refs.modalForm.disableSubmit = false;
@@ -306,7 +305,6 @@ export const JeecgListMixin = {
     },
     // 生产计划查看
     handleDetail2: function (record) {
-      console.log("生产计划查看：",record.orderId)
       this.$refs.modalForm.edit(record);
       this.$refs.modalForm.queryBynumber(record.orderId);
       this.$refs.modalForm.querygx(record.orderId,record.productType)
@@ -315,8 +313,6 @@ export const JeecgListMixin = {
     },
     // 根据月份和姓名查看工序
     querygxone: function (record) {
-      console.log("月份：",record.yanTime)
-      console.log("姓名：",record.undertaker)
       this.$refs.modalForm.edit(record);
       this.$refs.modalForm.queryGxOne(record.yanTime,record.undertaker);
       this.$refs.modalForm.title = "工序查看";
--- a/src/views/bidding_info/modules/TblBiddingShenqApproval1Model.vue
查看文件 @3007797
+++ b/src/views/bidding_info/modules/TblBiddingShenqApproval1Model.vue
查看文件 @3007797
@@ -102,11 +102,9 @@
       //   this.model.isagree = '1'
       // }
         this.visible = true;
-        console.log('this.model',this.model)
       },
       onChange(e) {
-        console.log('radio checked', e.target.value);
-        console.log('radio value',this.value);
+        
         //this.model.isagree = e.target.value
       },
       handleOk () {
@@ -114,7 +112,7 @@
         // 触发表单验证
         this.$refs.form.validate(valid => {
           if (valid) {
-            console.log(this.model)
+            
             const tempMOdel = {
               partNumber:this.model.partNumber,
               approvalOpinions:this.model.approvalOpinions,
--- a/src/views/bidding_info/modules/TblBiddingShenqApproval2Model.vue
查看文件 @3007797
+++ b/src/views/bidding_info/modules/TblBiddingShenqApproval2Model.vue
查看文件 @3007797
@@ -99,10 +99,10 @@
         this.model = Object.assign({}, record);
         this.visible = true;
         // this.model.isagree = '1'
-        console.log('this.model',this.model)
+        // console.log('this.model',this.model)
       },
       onChange(e) {
-        console.log('radio checked', e.target.value);
+        // console.log('radio checked', e.target.value);
         this.model.isagree = this.value
       },
       handleOk () {
@@ -110,7 +110,7 @@
         // 触发表单验证
         this.$refs.form.validate(valid => {
           if (valid) {
-            console.log(this.model)
+            // console.log(this.model)
             const tempMOdel = {
               partNumber:this.model.partNumber,
               approvalOpinions:this.model.approvalOpinions,
--- a/src/views/bidding_info/modules/TblBiddingShenqForm.vue
查看文件 @3007797
+++ b/src/views/bidding_info/modules/TblBiddingShenqForm.vue
查看文件 @3007797
@@ -231,7 +231,7 @@ export default {
     },
     edit(record) { 
       this.model = Object.assign({}, record)
-      console.log('this.model',this.model)
+      // console.log('this.model',this.model)
       this.modelDefault = this.model
       this.choose = this.model.chooseStatus
       if(!this.model.chooseStatus){
@@ -282,7 +282,7 @@ export default {
       },
     handleChange (value,option){
       let tempModel = option.data.attrs.channel
-      console.log('tempModel',tempModel)
+      // console.log('tempModel',tempModel)
       if(tempModel.partNumber){
         this.model.partNumber = tempModel.partNumber
       }
@@ -333,7 +333,7 @@ export default {
             httpurl += this.url.edit
             method = 'put'
           }
-          console.log(this.model)
+          // console.log(this.model)
           // return
           httpAction(httpurl, this.model, method)
             .then((res) => {
@@ -346,8 +346,8 @@ export default {
             })
             .finally(() => {
               that.confirmLoading = false
-              console.log(this.nickname())
-              console.log(this.userInfo().username)
+              // console.log(this.nickname())
+              // console.log(this.userInfo().username)
             })
         }
       })
--- a/src/views/order_form/TblOrderFormList.vue
查看文件 @3007797
+++ b/src/views/order_form/TblOrderFormList.vue
查看文件 @3007797
@@ -46,9 +46,9 @@
     <div class="table-operator">
       <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
       <!-- <a-button type="primary" icon="download" @click="handleExportXls('订单表')">导出</a-button> -->
-      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+      <!-- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
         <a-button type="primary" icon="import">导入</a-button>
-      </a-upload>
+      </a-upload> -->
       <!-- 高级查询区域 -->
       <!-- <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query> -->
     </div>
@@ -328,7 +328,7 @@
         this.$refs.ViewOrdersModal.disableSubmit = false;
       },
       handleViewProductionPlan(record){
-        console.log('handleViewProductionPlan',record)
+        // console.log('handleViewProductionPlan',record)
         this.$refs.ViewProductionPlanModal.edit(record);
         this.$refs.ViewProductionPlanModal.disableSubmit = false;
       },
--- a/src/views/order_form/modules/TblOrderFormModal.vue
查看文件 @3007797
+++ b/src/views/order_form/modules/TblOrderFormModal.vue
查看文件 @3007797
@@ -177,7 +177,7 @@ export default {
         getOrderCompanyList().then((res)=>{
           if(res.success){
             this.orderCompanyList = res.result
-            console.log('getOrderCompanyList',res)
+            // console.log('getOrderCompanyList',res)
           }
         });
       },
@@ -185,7 +185,7 @@ export default {
         getProductNameList().then((res)=>{
           if(res.success){
             this.productNameList = res.result
-            console.log('getProductNameList',res)
+            // console.log('getProductNameList',res)
           }
         });
       },
--- a/src/views/payroll/TblSalaryCalculationList.vue
查看文件 @3007797
+++ b/src/views/payroll/TblSalaryCalculationList.vue
查看文件 @3007797
@@ -266,7 +266,7 @@ export default {
           throw new Error('File path is empty.')
         }
         let token = Vue.ls.get(ACCESS_TOKEN)
-        console.log(token)
+        // console.log(token)
         // 发起文件下载请求
         const response = await fetch(Vue.prototype.API_BASE_URL + `/salary/calculation/download/${filePath}`, {
           method: 'GET',
--- a/src/views/payroll/basemodules/TblSalaryBaseForm.vue
查看文件 @3007797
+++ b/src/views/payroll/basemodules/TblSalaryBaseForm.vue
查看文件 @3007797
@@ -204,7 +204,7 @@ export default {
   },
   methods: {
     validatePhone(rule, value, callback) {
-      console.log(this.currentPhone)
+      // console.log(this.currentPhone)
       if (!value) {
         callback()
       } else {
@@ -214,7 +214,7 @@ export default {
           // 使用 Promise 或者 async/await 来等待异步请求完成
           getAction('/salary/base/listphone', param)
             .then((res) => {
-              console.log(value)
+              // console.log(value)
               if (value === this.currentPhone) {
                 callback()
               }else if (res.result && res.result.length <= 0) {
--- a/src/views/production/planModules/TblProductionAddpgForm.vue
查看文件 @3007797
+++ b/src/views/production/planModules/TblProductionAddpgForm.vue
查看文件 @3007797
@@ -160,17 +160,17 @@ export default {
       })
     },
     add(record) {
-      console.log('产品类型：', record.productType)
+      // console.log('产品类型：', record.productType)
       this.productType = record.productType
       this.panduan = record
       gongxuList(this.url.queryByType, { productTypeId: record.productType }).then((ress) => {
         if (ress) {
           //如果已派工时为0总工时*工时比例，否则（总工时-已派工时）*工时比例
-          console.log(record.dispatchedWorkingHours)
+          // console.log(record.dispatchedWorkingHours)
           if (record.dispatchedWorkingHours <= 0 || record.dispatchedWorkingHours === '') {
-            console.log('aa', ress.result)
-            console.log(record.totalWorkingHours)
+            // console.log('aa', ress.result)
+            // console.log(record.totalWorkingHours)
             // 将获取到的工序列表添加到数据源中
             this.res = ress.result.map((item) => ({
               workingProcedure: item.gongxu + ' （' + (item.bili * 100).toFixed() + '%）',
@@ -184,8 +184,8 @@ export default {
               productType: record.productType,
             }))
           } else if (record.dispatchedWorkingHours > 0) {
-            console.log('bb', ress.result)
-            console.log(record.totalWorkingHours)
+            // console.log('bb', ress.result)
+            // console.log(record.totalWorkingHours)
             // 将获取到的工序列表添加到数据源中
             this.res = ress.result.map((item) => ({
               workingProcedure: item.gongxu + ' （' + (item.bili * 100).toFixed() + '%）',
@@ -201,7 +201,7 @@ export default {
           }
         }
       })
-      console.log('派发人：', this.userInfo().realname)
+      // console.log('派发人：', this.userInfo().realname)
     },
     ...mapGetters(['nickname', 'avatar', 'userInfo']),
     submitForm() {
@@ -220,23 +220,23 @@ export default {
             if (allNumeric) {
               that.confirmLoading = true
               data=nonEmptyUndertakerRecords;
-              console.log('res：', this.res)
+              // console.log('res：', this.res)
               // 使用 reduce 方法累加工时字段值
               const zong = this.res.reduce((acc, current) => {
                 if (current.undertaker !== null && current.undertaker !== undefined && current.undertaker !== '') {
-                console.log('current.workhours：', current.workHours)
+                // console.log('current.workhours：', current.workHours)
                 return acc + parseFloat(current.workHours)
                 }
                 return acc
               }, 0)
-              console.log(this.panduan.dispatchedWorkingHours)
+              // console.log(this.panduan.dispatchedWorkingHours)
               if (this.panduan.dispatchedWorkingHours === '' || this.panduan.dispatchedWorkingHours === null) {
                 this.panduan.dispatchedWorkingHours = 0
               }
-              console.log(this.panduan.dispatchedWorkingHours)
+              // console.log(this.panduan.dispatchedWorkingHours)
               const zongpaifa = parseFloat(this.panduan.dispatchedWorkingHours) + zong
-              console.log('派发工时和：', zong)
-              console.log('已派发工时：', zongpaifa)
+              // console.log('派发工时和：', zong)
+              // console.log('已派发工时：', zongpaifa)
               if (zongpaifa <= this.panduan.totalWorkingHours) {
                 addPg(this.url.add, data)
                   .then((res) => {
--- a/src/views/production/planModules/TblProductionPlanForm.vue
查看文件 @3007797
+++ b/src/views/production/planModules/TblProductionPlanForm.vue
查看文件 @3007797
@@ -213,7 +213,7 @@ export default {
   },
   methods: {
     onImg(e) {
-      console.log(e)
+      // console.log(e)
       this.show = this.picList[e]
       this.num = e
     },
@@ -244,7 +244,7 @@ export default {
       })
     },
     queryBynumber(orderId) {
-      console.log('1订单号：', orderId)
+      // console.log('1订单号：', orderId)
       if(this.model.productType === '接地'){
               this.productType='接地'
             }else if(this.model.productType === '线槽'){
--- a/src/views/production/planModules/TblProductionYansForm.vue
查看文件 @3007797
+++ b/src/views/production/planModules/TblProductionYansForm.vue
查看文件 @3007797
@@ -126,23 +126,23 @@ export default {
     handleInputChange(record){
        // 找到当前更改行的索引
       const index = this.res.findIndex((item) => item.id === record.id)
-      console.log("index：",index)
+
       // 如果找到了该行
       if (index !== -1) {
         this.res[index].modified2 = true
       }
-      console.log("modified2：",this.res[index].modified2)
+      // console.log("modified2：",this.res[index].modified2)
     },
     handleYanResultChange(record) {
-      console.log('当前更改的行的ID：', record.id)
-      console.log('当前选中的值：', record.yanResult)
+      // console.log('当前更改的行的ID：', record.id)
+      // console.log('当前选中的值：', record.yanResult)
       // 找到当前更改行的索引
       const index = this.res.findIndex((item) => item.id === record.id)
       // 如果找到了该行
       if (index !== -1) {
-        console.log('页面加载时显示的值：', this.res[index].originalYanResult)
+        // console.log('页面加载时显示的值：', this.res[index].originalYanResult)
         // 比较当前选中的值和页面加载时显示的值
         if (record.yanResult !== this.res[index].originalYanResult) {
@@ -156,7 +156,7 @@ export default {
     },
     ...mapGetters(['nickname', 'avatar', 'userInfo']),
     yanshouList(record) {
-      console.log(record.orderId)
+      
       yanshouList(this.url.queryByNumber, { orderId: record.orderId }).then((ress) => {
         if (ress) {
           this.res = ress.result.map((item) => ({
@@ -188,8 +188,7 @@ export default {
           // 对记录进行分组，根据不同字段的修改情况进行更新
           const recordsToUpdate = this.res.reduce((acc, record) => {
-            console.log("是否修改2：",record.modified2)
-            console.log("是否修改：",record.modified)
+            
             // 判断是否有字段被修改
             if (record.modified) {
               // 若 yanResult 字段被修改，则整条记录更新
@@ -199,12 +198,12 @@ export default {
             }else if(record.modified2){
                 // 若只有 notes 字段被修改，则只更新 notes 字段
                 const updatedRecord = Object.assign({}, record, { notes: record.notes,yanTime:record.jiazaitime })
-                console.log("备注：",record)
+              
                 acc.push(updatedRecord)
             }
             return acc
           }, [])
-          console.log("recordsToUpdate：",recordsToUpdate)
+     
           if(recordsToUpdate.length>0){
             updateYan(this.url.updateYan, recordsToUpdate)
             .then((res) => {
@@ -219,8 +218,10 @@ export default {
               that.confirmLoading = false
             })
           }else{
-            this.confirmLoading = false
+            that.confirmLoading = false
+            that.$emit('ok')
             this.visible = false;
+            
           }
         }
--- a/src/views/productionProcess/modules/BiddingSqFormModal.vue
查看文件 @3007797
+++ b/src/views/productionProcess/modules/BiddingSqFormModal.vue
查看文件 @3007797
@@ -168,9 +168,9 @@ export default {
   },
   methods: {
     validProductName(rule, value, callback) {
-           console.log('rule',rule)
-           console.log('value',value)
-           console.log('this.model',this.model)
+          //  console.log('rule',rule)
+          //  console.log('value',value)
+          //  console.log('this.model',this.model)
         },
     add() {
       this.edit();
@@ -178,7 +178,7 @@ export default {
     edit(id) {
       this.model.orderId = id
       this.model.chooseStatus = 0
-      console.log('this.model:===',this.model)
+      // console.log('this.model:===',this.model)
       // this.model = Object.assign({}, record);
       this.visible = true;
       this.loadTree()
@@ -192,7 +192,7 @@ export default {
         httpAction(this.url.listAllMaterial,null, "get").then((res) => {
             if (res.success) {
               this.materialOptions = res.result
-              console.log('materialOptions',this.materialOptions)
+              // console.log('materialOptions',this.materialOptions)
             } else {
               // that.$message.warning(res.message);
             }
@@ -211,7 +211,7 @@ export default {
       // 触发表单验证
       this.$refs.form.validate(valid => {
         if (valid) {
-          console.log(this.model)
+          // console.log(this.model)
           // return
           this.$emit('childByValue', this.model)
           that.close();
@@ -233,7 +233,7 @@ export default {
     },
     handleChange (value,option){
       let tempModel = option.data.attrs.channel
-      console.log('tempModel',tempModel)
+      // console.log('tempModel',tempModel)
       if(tempModel.partNumber){
         this.model.partNumber = tempModel.partNumber
       }
--- a/src/views/trad/modules/base/TblTradBaseForm.vue
查看文件 @3007797
+++ b/src/views/trad/modules/base/TblTradBaseForm.vue
查看文件 @3007797
@@ -191,8 +191,8 @@ export default {
   },
   methods: {
     validateNumber(rule, value, callback) {
-      console.log(this.currentTenNumber)
-      console.log(this.currentPartNumber)
+      // console.log(this.currentTenNumber)
+      // console.log(this.currentPartNumber)
       if (!value) {
         callback()
       } else {
--- a/src/views/trad/modules/contract/TblTradContractForm.vue
查看文件 @3007797
+++ b/src/views/trad/modules/contract/TblTradContractForm.vue
查看文件 @3007797
@@ -102,8 +102,8 @@ export default {
       let res2 = await getAction(this.url.queryhetongBy, param2)
       let res = await getAction(this.url.queryBy, param)
-      console.log(res)
-      console.log(res2)
+      // console.log(res)
+      // console.log(res2)
       if (res.result && res.result.length <=0) {
         this.$message.error('没有这个招标信息，请重新输入')
@@ -120,7 +120,7 @@ export default {
       }
       // this.readOnly = false
       this.isBianhaoDisabled=false
-      console.log('禁否：', this.isBianhaoDisabled)
+      // console.log('禁否：', this.isBianhaoDisabled)
       this.confirmLoading = false
       return
     },
--- a/src/views/trad/modules/fphk/TblTradFphkForm.vue
查看文件 @3007797
+++ b/src/views/trad/modules/fphk/TblTradFphkForm.vue
查看文件 @3007797
@@ -129,8 +129,8 @@ export default {
       let res2 = await getAction(this.url.queryfphkBy, param2)
       let res = await getAction(this.url.queryBy, param)
-      console.log(res)
-      console.log(res2)
+      // console.log(res)
+      // console.log(res2)
       if (res.result && res.result.length <=0) {
         this.$message.error('没有这个招标信息，请重新输入')
--- a/src/views/trad/modules/inquiry/TblTradInquiryForm.vue
查看文件 @3007797
+++ b/src/views/trad/modules/inquiry/TblTradInquiryForm.vue
查看文件 @3007797
@@ -120,7 +120,7 @@ export default {
       const param = { tenderNumber: this.model.tenderNumber, partNumber: this.model.partNumber }
       let res = await getAction(this.url.queryBy, param)
-      console.log(res)
+      // console.log(res)
       if (res.result && res.result.length <=0) {
         this.$message.error('没有这个招标信息，请重新输入')
--- a/src/views/trad/modules/tender/TblTradTenderForm.vue
查看文件 @3007797
+++ b/src/views/trad/modules/tender/TblTradTenderForm.vue
查看文件 @3007797
@@ -176,8 +176,8 @@ export default {
       let res2 = await getAction(this.url.querytenderBy, param2)
       let res = await getAction(this.url.queryBy, param)
-      console.log(res)
-      console.log(res2)
+      // console.log(res)
+      // console.log(res2)
       if (res.result && res.result.length <=0) {
         this.$message.error('没有这个招标信息，请重新输入')
--- a/src/views/trad/modules/tou/TblTradTouForm.vue
查看文件 @3007797
+++ b/src/views/trad/modules/tou/TblTradTouForm.vue
查看文件 @3007797
@@ -118,8 +118,8 @@ export default {
       let res2 = await getAction(this.url.querytouBy, param2)
       let res = await getAction(this.url.queryBy, param)
-      console.log(res)
-      console.log(res2)
+      // console.log(res)
+      // console.log(res2)
       if (res.result && res.result.length <=0) {
         this.$message.error('没有这个招标信息，请重新输入')
--- a/src/views/work_time/TblWorkTimeList.vue
查看文件 @3007797
+++ b/src/views/work_time/TblWorkTimeList.vue
查看文件 @3007797
@@ -6,13 +6,13 @@
         <a-row :gutter="24">
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="姓名">
-              <a-input placeholder="请输入姓名" v-model="queryParam.name"></a-input>
+              <a-input placeholder="请输入姓名" v-model="queryParam.undertaker"></a-input>
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="工资月份">
               <a-month-picker
-                v-model="queryParam.salaryMonth"
+                v-model="queryParam.yanTime"
                 placeholder="请选择工资月份"
                 format="YYYY-MM"
                 @change="handleMonthChange"
@@ -33,7 +33,7 @@
     <!-- 操作按钮区域 -->
     <div class="table-operator">
       <!-- <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button> -->
-      <a-button type="primary" icon="download" @click="handleExportXls('tbl_work_time')">导出</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('月工时信息')">导出</a-button>
       <!-- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
         <a-button type="primary" icon="import">导入</a-button>
       </a-upload> -->
@@ -178,7 +178,7 @@
         },
         dictOptions:{},
-        superFieldList:[],
+        superFieldList:[]
       }
     },
     created() {
@@ -191,7 +191,7 @@
     },
     methods: {
       handleMonthChange(value) {
-      this.queryParam.salaryMonth = value ? value.format('YYYY-MM') : null
+      this.queryParam.yanTime = value ? value.format('YYYY-MM') : null
     },
       initDictConfig(){
       },