Merge remote-tracking branch 'origin/master'

src/api/pages/core/system-setting.js

@@ -20,6 +20,6 @@ export default {
  */
 export const routeUrl = {
   systemSetting: {
-    save: {key: 'save', method: 'save'}
+    save: {key: 'save', method: 'save'},
   }
 }

src/components/base/custom-report/custom-report.vue

@@ -185,7 +185,7 @@ export default {
           this.data = data
           console.log(this.data)
         }else{
-          this.$Message.error(res.message)
+          this.$Message.warning(res.message)
         }
       })
     },

src/components/base/dk-approval-flow/dk-approval-flow.vue

@@ -134,7 +134,7 @@ export default {
             })
             resolve(res.data.list)
           } else {
-            this.$Message.error(res.message)
+            this.$Message.warning(res.message)
             reject(res.message);
           }
         })

src/components/base/dk-approval-flow/drawer/approverDrawer.vue

@@ -133,7 +133,7 @@ export default {
         if (res.code === 200) {
           this.postList = res.data.list
         } else {
-          this.$message.error(res.message)
+          this.$Message.warning(res.message)
         }
         this.loading = false
       })
@@ -148,7 +148,7 @@ export default {
         if (res.code === 200) {
           this.userList = res.data.list
         } else {
-          this.$message.error(res.message)
+          this.$Message.warning(res.message)
         }
       })
     },

src/components/base/dk-approval-flow/drawer/conditionDrawer.vue

@@ -373,7 +373,7 @@ export default {
         if (res.code === 200) {
           this.orgList = res.data.list
         } else {
-          this.$Message.error(res.message)
+          this.$Message.warning(res.message)
         }
       })
     }

src/components/base/dk-approval-flow/drawer/copyerDrawer.vue

@@ -108,7 +108,7 @@ export default {
         if (res.code === 200) {
           this.userList = res.data.list
         } else {
-          this.$message.error(res.message)
+          this.$Message.warning(res.message)
         }
       })
     },

src/components/base/dk-export/dk-export.vue

@@ -42,7 +42,7 @@ export default {
     ok() {
       let batchRows = this.$refs['table-select'].batchRows;
       if (!batchRows || batchRows.length === 0) {
-        this.$Message.error(this.$t('W_013'))
+        this.$Message.warning(this.$t('W_013'))
         return;
       }
       let item = {}

src/components/base/dk-pic-wall/dk-pic-wall.vue

@@ -182,7 +182,7 @@ export default {
           )
         }
       } else {
-        this.$Message.error(res.message)
+        this.$Message.warning(res.message)
       }
     },
 

src/components/base/dk-position/dk-position.vue

@@ -178,7 +178,7 @@ export default {
         }
         // 提示没有数据
         if (tableData.length === 0) {
-          this.$message.error("未查询到数据");
+          this.$Message.warning("未查询到数据");
         }
         this.tableData = tableData
       }

src/components/base/dk-table/dk-table-column.vue

@@ -23,7 +23,7 @@
             class="change-icon-class" @click="handleExchangeClick(row)"
             type="iconfont iconfont icon-exchange"></icon>
       <!--      :class="treeFlag && row.parentId ?'seq-class-s':'seq-class-t'"-->
-      <div style="cursor: pointer" :style="{'padding-left':(treeFlag?'10px':'0')}"
+      <div :style="{'padding-left':(treeFlag?'10px':'0'),'cursor':(chooseDataFlag?'pointer':'default')}"
            @dblclick.stop="chooseData(row,rowIndex)">{{ seq }}
       </div>
     </template>
@@ -394,6 +394,11 @@ export default {
     centerFlag:{
       type:Boolean,
       default:null
+    },
+    // 是否开启双击行号选择数据的标识
+    chooseDataFlag:{
+      type: Boolean,
+      default: false
     }
   },
   data() {
@@ -464,7 +469,7 @@ export default {
      * @date   : 2023/2/19 18:43
      */
     chooseData(row, rowIndex) {
-      if (this.dkTable && this.dkTable.chooseData) {
+      if (this.chooseDataFlag && this.dkTable && this.dkTable.chooseData) {
         this.dkTable.chooseData(row, rowIndex);
       }
     },

src/components/base/dk-table/dk-table.vue

@@ -40,7 +40,7 @@
       :row-config="{isCurrent: true, isHover: true}"
     >
       <DkTableColumn v-if="chooseFlag" :type="(multiple?'checkbox':'radio')" width="50" fixed="left"></DkTableColumn>
-      <DkTableColumn type="seq" width="45" fixed="left" :show-tip="showTip" :seq-tip-content="seqTipContent"
+      <DkTableColumn type="seq" width="45" fixed="left" :show-tip="showTip" :seq-tip-content="seqTipContent" :chooseDataFlag="chooseDataFlag"
                      :add-flag="addFlag"></DkTableColumn>
       <slot></slot>
     </vxe-table>
@@ -356,6 +356,11 @@ export default {
       type: Boolean,
       default: true
     },
+    // 是否开启双击行号选择数据的标识
+    chooseDataFlag:{
+      type: Boolean,
+      default: false
+    }
   },
   provide() {
     return {
@@ -1692,6 +1697,9 @@ export default {
      * @date   : 2022/3/7 9:35
      */
     cellClick({row, column}) {
+      if(column.type === 'seq' && this.chooseDataFlag){
+        return;
+      }
       let self = this;
       self.$emit('cell-click', {row, column})
       if (!this.chooseFlag) return;
@@ -1809,7 +1817,7 @@ export default {
               this.$emit('load-children', childs, row)
               resolve(childs)
             } else {
-              this.$Message.error(res.message)
+              this.$Message.warning(res.message)
             }
           })
         }

src/components/base/edit-table/edit-table.vue

@@ -64,6 +64,7 @@
         <!--   选取类型   -->
         <vxe-column v-if="colItem.type === 'tableSelect'" :field="colItem.field"
                     :type="colItem.type"
+                    :header-class-name="colItem.required?'required-class':''"
                     :width="colItem.width?colItem.width:vm.$config.columnWidth"
                     :min-width="colItem.minWidth?colItem.minWidth:vm.$config.columnWidthMin"
                     :title="colItem.title?colItem.title:$t(colItem.field)" :params="{type:'tableSelect'}"
@@ -170,6 +171,7 @@
         <vxe-column v-if="colItem.type === 'text'" :field="colItem.field"
                     :title="colItem.title?colItem.title:$t(colItem.field)"
                     :type="colItem.type"
+                    :header-class-name="colItem.required?'required-class':''"
                     :width="colItem.width?colItem.width:vm.$config.columnWidth"
                     :min-width="colItem.minWidth?colItem.minWidth:vm.$config.columnWidthMin"
                     :edit-render="{autofocus: '.vxe-input--inner'}">
@@ -212,6 +214,7 @@
                     :title="colItem.title?colItem.title:$t(colItem.field)"
                     :type="colItem.type"
                     class-name="number-class"
+                    :header-class-name="colItem.required?'required-class':''"
                     :width="colItem.width?colItem.width:vm.$config.columnWidth"
                     :min-width="colItem.minWidth?colItem.minWidth:vm.$config.columnWidthMin"
                     :edit-render="{autofocus: '.vxe-input--inner', autoselect: true}" :formatter="formatColumn"
@@ -256,10 +259,37 @@
           </template>
         </vxe-column>
 
+        <!--  主从多选组件-->
+        <vxe-column v-if="colItem.type === 'multiSelect'" :field="colItem.field"
+                    :title="colItem.title?colItem.title:$t(colItem.field)"
+                    :type="colItem.type"
+                    :header-class-name="colItem.required?'required-class':''"
+                    :width="colItem.width?colItem.width:vm.$config.columnWidth"
+                    :min-width="colItem.minWidth?colItem.minWidth:vm.$config.columnWidthMin"
+                    :edit-render="{autofocus: '.vxe-input--inner'}">
+          <template #default="{ row,rowIndex }">
+            <div style="padding-left: 10px;">
+              {{ row[colItem.field + '_Name'] }}
+            </div>
+          </template>
+          <template #edit="{ row,rowIndex }">
+            <MultiSelect v-model="row[colItem.field]"
+                         main-field="ownerFlag"
+                         :table-flag="true"
+                         @ok="getMultiSelect(Object.assign($event,{row,rowIndex,colItem}))"
+                         :default-value="row[colItem.field + '_Name']"
+                         :title="$t('pdtModelName')"
+                         :fromTitle="$t('staffNames')"
+                         :type="vm.$config.MagnifierType.product"
+            ></MultiSelect>
+          </template>
+        </vxe-column>
+
         <!--   下拉   -->
         <vxe-column v-if="colItem.type === 'select'" :field="colItem.field"
                     :title="colItem.title?colItem.title:$t(colItem.field)"
                     :type="colItem.type"
+                    :header-class-name="colItem.required?'required-class':''"
                     :width="colItem.width?colItem.width:vm.$config.columnWidth"
                     :min-width="colItem.minWidth?colItem.minWidth:vm.$config.columnWidthMin"
                     :edit-render="{autofocus: '.vxe-input--inner'}">
@@ -340,6 +370,7 @@
         <vxe-column v-if="colItem.type === 'date'" :params="{type:'date'}"
                     :field="colItem.title?colItem.title:$t(colItem.field)"
                     :type="colItem.type"
+                    :header-class-name="colItem.required?'required-class':''"
                     :width="colItem.width?colItem.width:vm.$config.columnWidth"
                     :min-width="colItem.minWidth?colItem.minWidth:vm.$config.columnWidthMin"
                     :title="$t(colItem.field)" :edit-render="{autofocus: '.vxe-input--inner'}">
@@ -373,9 +404,10 @@
 
         <!--  选择框  -->
         <vxe-column v-if="colItem.type === 'checkbox'" :field="colItem.field"
+                    :header-class-name="colItem.required?'required-class':''"
                     :width="colItem.width?colItem.width:vm.$config.columnWidth"
                     :min-width="colItem.minWidth?colItem.minWidth:vm.$config.columnWidthMin"
-                    :tree-node="colItem.treeNode">
+                    :tree-node="colItem.treeNode" :edit-render="{autofocus: '.vxe-input--inner'}">
           <template #header="{ row }">
             <div class="checkbox-class">
               <vxe-checkbox :ref="colItem.field+'_header'" v-model="colItem.chooseAllFlag"
@@ -404,6 +436,7 @@
         <vxe-column v-if="colItem.type === 'switch'" :params="{type:'switch'}"
                     :title="colItem.title?colItem.title:$t(colItem.field)"
                     :type="colItem.type"
+                    :header-class-name="colItem.required?'required-class':''"
                     :width="colItem.width?colItem.width:vm.$config.columnWidth"
                     :min-width="colItem.minWidth?colItem.minWidth:vm.$config.columnWidthMin"
                     :field="$t(colItem.field)" :edit-render="{autofocus: '.vxe-input--inner'}">
@@ -709,7 +742,6 @@ export default {
     data(n, o) {
       // 编辑
       if (n && n.length > 0) {
-
         this.tableData = n
         this.handleSelectData();
       } else {
@@ -1852,6 +1884,17 @@ export default {
       }
     },
     /**
+     * @desc   : 设置主从数据赋值
+     * @author : 周兴
+     * @date   : 2023/5/9 15:53
+     */
+    getMultiSelect(e) {
+      if (this.tableData[e.rowIndex]) {
+        this.$set(this.tableData[e.rowIndex], e.colItem.field, e.rows)
+        this.$set(this.tableData[e.rowIndex], e.colItem.field + '_Name', e.display)
+      }
+    },
+    /**
      * @desc   : 跳转到下一个可输入单元格
      * @author : 周兴
      * @date   : 2022/4/7 15:36
@@ -2462,7 +2505,7 @@ export default {
               if (row['_X_ID'] != tmpRows[0]['_X_ID']) {
                 //提示信息重复
                 if (showMessage) {
-                  this.$Message.error(vm.$t('W_018'))
+                  this.$Message.warning(vm.$t('W_018'))
                 }
                 resolve(true);
               }
@@ -2481,7 +2524,7 @@ export default {
             if (data && data.length > 0) {
               //提示信息重复
               if (showMessage) {
-                this.$Message.error(vm.$t('W_018'))
+                this.$Message.warning(vm.$t('W_018'))
               }
               resolve(true);
             }
@@ -2624,14 +2667,18 @@ export default {
         let validRules = {}
         this.requiredColumn.forEach(col => {
           let tempCol = this.columns.filter(it => it.field === col);
-          if (tempCol) {
-            validRules[col] = [{
-              required: true,
-              // message: vm.$t('inputWords', {'search-name': tempCol[0].title ? tempCol[0].title : vm.$t(tempCol[0].field)})
-            }]
+          if(tempCol && tempCol.length > 0){
+            tempCol[0].required = true;
           }
+          // if (tempCol) {
+          //   validRules[col] = [{
+          //     required: true,
+          //     // message: vm.$t('inputWords', {'search-name': tempCol[0].title ? tempCol[0].title : vm.$t(tempCol[0].field)})
+          //   }]
+          // }
         })
-        this.validRules = validRules;
+        console.log('b',this.columns)
+        // this.validRules = validRules;
       }
     },
     /**
@@ -2890,4 +2937,16 @@ export default {
   margin-bottom: 0 !important;
 }
 
+/deep/ .close-div-class .ivu-input-group {
+  top: 3px !important
+}
+
+/deep/.required-class .vxe-cell--edit-icon {
+  color: red !important;
+}
+
+/deep/.vxe-cell--edit-icon{
+  margin-top: 1px !important;
+}
+
 </style>

src/components/base/edit-tree-table/edit-tree-table.vue

@@ -1946,7 +1946,7 @@ export default {
           if (res.code === 200) {
             resolve(res.data)
           } else {
-            this.$Message.error(res.message)
+            this.$Message.warning(res.message)
           }
         })
       })
@@ -3273,7 +3273,7 @@ export default {
                 //设置子级数据
                 resolve(batchRows)
               } else {
-                this.$Message.error(res.message)
+                this.$Message.warning(res.message)
               }
             })
           } else {
@@ -3320,7 +3320,7 @@ export default {
             if (row['id'] != tmpRows[0]['id']) {
               //提示信息重复
               if (showMessage) {
-                this.$Message.error(vm.$t('W_018'))
+                this.$Message.warning(vm.$t('W_018'))
               }
               return true
             }
@@ -3338,7 +3338,7 @@ export default {
           if (data && data.length > 0) {
             //提示信息重复
             if (showMessage) {
-              this.$Message.error(vm.$t('W_018'))
+              this.$Message.warning(vm.$t('W_018'))
             }
             return true
           }
@@ -3805,7 +3805,7 @@ export default {
             //显示可替换的界面
             // this.showModal = true
           } else {
-            this.$Message.error(res.message)
+            this.$Message.warning(res.message)
           }
         })
       })
@@ -3856,13 +3856,13 @@ export default {
         }
         //有重复数据
         else {
-          this.$Message.error(this.$t('W_141'))
+          this.$Message.warning(this.$t('W_141'))
           return
         }
       } else {
         // 判断替品是否有标价
         if (!row.priceStandard && row.priceStandard != 0) {
-          this.$Message.error(this.$t('W_069', {'param': this.$t('priceStandard')}))
+          this.$Message.warning(this.$t('W_069', {'param': this.$t('priceStandard')}))
           return
         }
         // 关闭弹窗

src/components/business/approval-detail-table/approval-detail-table.vue

@@ -95,7 +95,7 @@ export default {
           this.tableData=resData
           this.$emit('approval-data',  this.tableData)
         } else {
-          this.$Message.error(res.message)
+          this.$Message.warning(res.message)
         }
       })
     }

src/components/business/modal-receipt/modal-receipt.vue

@@ -321,12 +321,12 @@ export default {
       this.$refs['receiptAmountTable'].$refs.table.clearActived();
       // 判断剩余应收是否小于0
       // if (!this.negativeData && this.surplusAmount < 0) {
-      //   this.$message.error(this.$t('W_041', {'param': this.$t('surplusAmount')}))
+      //   this.$Message.warning(this.$t('W_041', {'param': this.$t('surplusAmount')}))
       //   this.errorFlag = true;
       //   return;
       // }
       if (this.negativeData && this.surplusAmount > 0) {
-        this.$message.error(this.$t('W_008', {'param1': this.$t('refundAmount'), 'param2': this.$t('canRefundAmount')}))
+        this.$Message.warning(this.$t('W_008', {'param1': this.$t('refundAmount'), 'param2': this.$t('canRefundAmount')}))
         this.errorFlag = true;
         return;
       }
@@ -335,7 +335,7 @@ export default {
         let filterRows = this.dataFinal.filter(it => it.typeId === -1);
         if (filterRows && filterRows.length > 0) {
           if (this.usablePrestore < filterRows[0]['itemAmount']) {
-            this.$message.error(this.$t('W_008', {
+            this.$Message.warning(this.$t('W_008', {
               'param1': this.$t('prestoreAmount'),
               'param2': this.$t('canUsePrestore')
             }))

src/components/business/modal-search-form/index.vue

@@ -62,6 +62,7 @@
              :show-setting-flag="false"
              :show-tip="true"
              :seq-tip-content="vm.$t('doubleSeq')"
+             :choose-data-flag="true"
              :linkClickChecked="true" @pageChange="pageSizeChange"
              @chooseData="chooseData"
     >
@@ -177,7 +178,7 @@ export default {
      */
     checkBatch() {
       if (this.$refs['table-select'].batchKeys.length <= 0) {
-        this.$Message.error('请先选择数据')
+        this.$Message.warning('请先选择数据')
         return false
       }
       return true
@@ -260,7 +261,7 @@ export default {
           }
           this.$refs['table-select'].pageInfo.total = res.data.total
         } else {
-          this.$Message.error(res.message)
+          this.$Message.warning(res.message)
         }
       })
     },

src/components/business/modal_batch_edit/modal_batch_edit.vue

@@ -274,7 +274,7 @@ export default {
       // 校验，至少要修改一项
       if(!this.check()){
         this.focus(); // 光标回到第一个元素
-        this.$Message.error(vm.$t('W_017'))
+        this.$Message.warning(vm.$t('W_017'))
         return;
       }
       this.editBatchModal = false;

src/components/business/multi-select/multi-select.vue

@@ -1,8 +1,8 @@
 <template>
   <div>
     <div style="display: flex;align-items: center;">
-      <InputPop ref="input" :value="selectedValue"
-                :clearable="true"  :magnifierFlag="true" readonly @on-clear="clearAll" @on-focus="magnifierClick(true)"
+      <InputPop ref="input" :value="selectedValue" :class="tableFlag?'input-class':''"
+                :clearable="true" :magnifierFlag="true" readonly @on-clear="clearAll" @on-focus="magnifierClick(true)"
                 @on-keydown="handleInputKeydown"/>
       <!--      <div class="close-class" v-if="!readonly && selectedValue && selectedValue.length > 0">-->
       <!--        <Icon slot="prefix" type="ios-close-circle" @click.stop="clearAll"/>-->
@@ -26,7 +26,7 @@
       </BaseIndexButtonGroup>
       <!--      <SearchCond id="search-cond-div" width="780px" v-if="searchCond && searchCond.length > 0" ref="searchCond"-->
       <!--                  v-model="searchCond" :setFlag="false" :searchContent="searchCond" :col-count="4"></SearchCond>-->
-      <SearchCond id="search-cond-div" width="1000px" v-if="searchContent && searchContent.length > 0" ref="searchCond"
+      <SearchCond id="search-cond-div" width="700" v-if="searchContent && searchContent.length > 0" ref="searchCond"
                   v-model="searchCond" :setFlag="false" :searchContent="searchContent" :col-count="4"></SearchCond>
       <DkTable :primaryKey="selectKey" :clear-check-flag="false" ref="table-select" :id="'table-'+$options.name"
                name="table" :data="tableData"
@@ -105,16 +105,6 @@ export default {
       type: String,
       default: ''
     },
-    // 是否需要公司Id
-    cpId: {
-      type: Boolean,
-      default: true
-    },
-    // 是否需要系统id
-    sysId: {
-      type: Boolean,
-      default: true
-    },
     // 比例的字段
     rateField: {
       type: String,
@@ -139,6 +129,11 @@ export default {
     organizationFlag: {
       type: Boolean,
       default: false
+    },
+    // 是否从表格中调用的
+    tableFlag: {
+      type: Boolean,
+      default: false
     }
   },
   data() {
@@ -197,9 +192,14 @@ export default {
       //赋默认值
       this.setDefaultValue();
     },
+    value(n, o) {
+      if (!n || n.length == 0) {
+        this.selectedValue = null;
+      }
+    },
     orderId(n, o) {
       // 如果Id改变，需要重新查询数据库
-      this.getDataTable();
+      // this.getDataTable();
     }
   },
   methods: {
@@ -326,7 +326,6 @@ export default {
     clear() {
       this.searchList = {}
       this.searchTable = {}
-      this.getDataTable() // 重新查询
     },
     /**
      * @desc   : 获取表格数据
@@ -341,16 +340,7 @@ export default {
       // 不分页 todo
       param.pageSize = this.$config.maxPageSize;
       param.currentPage = 1
-      // 如果是结算方式或仓库，需要赋值给|| this.type === this.$config.MagnifierType.warehouse
-      if (this.type === this.$config.MagnifierType.settlementType) {
-        param['orgId'] = this.orderId;
-        if (this.organizationFlag) {
-          param.organizationFlag = true;
-        }
-      } else {
-        param['orderId'] = this.orderId
-      }
-
+      param.ftyId = this.$store.state.user.ftyId
       // 拼接外部传入的其他参数otherCondition
       if (this.otherCondition) {
         param = Object.assign(param, this.otherCondition)
@@ -367,6 +357,7 @@ export default {
             arr = res.data;
           }
           this.tableData = arr;
+          console.log('value', this.value)
           // 根据传入的数据进行数据处理
           if (this.value && this.value.length > 0) {
             let filterRows = []
@@ -410,7 +401,7 @@ export default {
             }
           }
         } else {
-          this.$Message.error(res.message)
+          this.$Message.warning(res.message)
         }
       })
     },
@@ -442,10 +433,10 @@ export default {
         return;
       }
       //打开从第一页开始
-      this.$refs['table-select'].pageInfo.currentPage = 1
+      // this.$refs['table-select'].pageInfo.currentPage = 1
       this.showModal = true
       if (this.model) {
-        this.$refs['table-select'].batchKeys = [this.model]
+        // this.$refs['table-select'].batchKeys = [this.model]
         this.batchKeysPage = [this.model]
       }
     },
@@ -458,10 +449,10 @@ export default {
       this.clearFlag = true;
       this.showClear = false
       this.selectedValue = ''
-      this.$refs['table-select'].clearBatchKeys() //清空选择
+      this.$refs['table-select']?.clearBatchKeys() //清空选择
       this.batchKeysPage = null
       this.batchRowsPage = null;
-      this.$emit('ok', []);
+      this.$emit('ok', {rows: [], display: null});
     },
     /**
      * @desc   : modal变化事件
@@ -470,7 +461,7 @@ export default {
      */
     onVisibleChange(val) {
       if (val) {
-        this.getDataTable()
+        // this.getDataTable()
       } else {
         this.searchTable = {} // 关闭选择画面需要清空条件
       }
@@ -482,7 +473,7 @@ export default {
      */
     checkBatch() {
       if (this.batchKeysPage.length <= 0) {
-        this.$Message.error('请先选择数据')
+        this.$Message.warning('请先选择数据')
         return false
       }
       return true
@@ -513,7 +504,7 @@ export default {
         //主业务部门必须是门店
         // if (this.type === this.$config.MagnifierType.organization &&
         // this.batchRowsPage.some(s => s.ownerFlag && !s.flgStore)) {
-        //   this.$Message.error(this.$t('W_052'))
+        //   this.$Message.warning(this.$t('W_052'))
         //   return
         // }
         this.showModal = false
@@ -523,7 +514,11 @@ export default {
         //光标切回select组件
         this.$refs['input'].$refs.input.focus = true
         this.clearFlag = false;
-        this.$emit('ok', this.batchRowsPage)
+        this.$emit('ok', {rows: this.batchRowsPage, display: this.selectedValue})
+        // 清空查询条件
+        this.$refs['searchCond'].clearCondition();
+        // 清空表格
+        this.tableData = []
       }
     },
     /**
@@ -537,24 +532,27 @@ export default {
         // 把选择的数据显示出来，主的显示在第一位
         let display = ''
         let list = this.batchRowsPage.filter(it => it[this.mainField])
-        if (list && list.length > 0) {
-          display = list[0][this.selectLabel] + '【主】'
-        }
+        // if (list && list.length > 0) {
+        //   display = list[0][this.selectLabel] + '【主】'
+        // }
         // 从业务数据
-        list = this.batchRowsPage.filter(it => !it[this.mainField])
-        if (list && list.length > 0) {
+        let subList = this.batchRowsPage.filter(it => !it[this.mainField])
+        if (subList && subList.length > 0) {
+          display = list[0][this.selectLabel] + '【主】'
           display += ',';
-          list.forEach(it => {
+          subList.forEach(it => {
             display += it[this.selectLabel] + ','
           })
           display = display.substring(0, display.length - 1)
+        } else {
+          display = list[0][this.selectLabel]
         }
         this.selectedValue = display;
       } else {
         this.selectedValue = null;
       }
       if (!isShowOkEventFlag) {
-        this.$emit('ok', this.batchRowsPage)
+        this.$emit('ok', {rows: this.batchRowsPage, display: this.selectedValue})
       }
     },
     /**
@@ -563,6 +561,10 @@ export default {
      * @date   : 2022/3/7 15:43
      */
     cancel() {
+      // 清空查询条件
+      this.$refs['searchCond'].clearCondition();
+      // 清空表格
+      this.tableData = []
       this.showModal = false
     },
     /**
@@ -620,7 +622,7 @@ export default {
      */
     setDefaultValue() {
       if (this.defaultValue) {
-        this.selectedValue = this.defaultValue + '【主】'
+        this.selectedValue = this.defaultValue
       }
     },
     /**
@@ -645,6 +647,29 @@ export default {
           {field: 'ownerFlag', width: '40', type: 'switch', disabled: false},
         ]
       }
+      // 产品
+      else if (self.type === this.$config.MagnifierType.product) {
+        self.service = this.$service.commonService
+        self.methodsNameDetail = 'getModelProductByPage'
+        // 查询条件
+        self.searchContent = [
+          {
+            valueFormat: {code: 'modelCode'},
+          },
+          {
+            valueFormat: {code: 'modelName'},
+          },
+        ]
+        self.selectKey = 'modelId'
+        self.selectLabel = 'modelName'
+        self.columns = [
+          {field: 'modelCode', width: '150'},
+          {field: 'modelName', width: '150'},
+          {field: 'categoryName', width: '150'},
+          {field: 'ownerFlag', width: '100', type: 'switch', disabled: false},
+          {field: 'remarks', width: 'auto'},
+        ]
+      }
       // 部门
       else if (self.type === self.$config.MagnifierType.organization) {
         self.service = this.$service.commonService
@@ -740,7 +765,7 @@ export default {
     this.setDefaultValue();
   },
   mounted() {
-    this.getDataTable()
+    // this.getDataTable()
   }
 }
 </script>
@@ -769,6 +794,10 @@ export default {
   padding-right: 20px !important;
 }
 
+.input-class {
+  height: 30px;
+  line-height: 30px;
+}
 
 </style>
 

src/components/business/print/button.vue

@@ -102,7 +102,7 @@ export default {
             this.$set(it,'templateData',it.tmData)
           })
         }else{
-          this.$Message.error(res.message)
+          this.$Message.warning(res.message)
         }
       })
     }

src/components/business/print/index.vue

@@ -355,7 +355,7 @@ export default {
               })
             }
           } else {
-            this.$Message.error(res.message)
+            this.$Message.warning(res.message)
           }
         })
       }

src/components/business/print/modal.vue

@@ -83,7 +83,7 @@ export default {
           this.currentTemplate = null
           this.currentPrinter = null
         } else {
-          this.$Message.error(res.message)
+          this.$Message.warning(res.message)
         }
       })
 
@@ -97,7 +97,7 @@ export default {
           })
           // console.log(this.templateList)
         }else{
-          this.$Message.error(res.message)
+          this.$Message.warning(res.message)
         }
       })
     },
@@ -111,7 +111,7 @@ export default {
         if (res.code === this.$config.SUCCESS_CODE) {
           this.printerList = res.data.list
         } else {
-          this.$Message.error(res.message)
+          this.$Message.warning(res.message)
         }
       })
     }

src/components/business/print/template.vue

@@ -746,7 +746,7 @@ export default {
       if (event.code == 200 && event.data && event.data.absolutelyPath) {
         this.imgList[this.currentImgIndex].path = event.data.absolutelyPath
       } else {
-        this.$Message.error(event.message)
+        this.$Message.warning(event.message)
       }
     },
     /**
@@ -763,7 +763,7 @@ export default {
         this.backgroundConfig.path = this.$config.imgUrl + response.data.relativePath
         this.backgroundConfig.relativePath = response.data.relativePath
       } else {
-        this.$Message.error(response.message)
+        this.$Message.warning(response.message)
       }
     },
     /**
@@ -1672,19 +1672,19 @@ export default {
      */
     save() {
       if (this.moveList.length <= 0 && this.tableInfo === null && this.imgList.length <= 0) {
-        this.$Message.error(this.$t('W_030'))
+        this.$Message.warning(this.$t('W_030'))
         return
       }
 
       // if (!this.templateName) {
       //   // this.$Message.warning('请输入模板名称')
-      //   this.$Message.error(this.$t('W_001', { 'param': this.$t('templateName') }))
+      //   this.$Message.warning(this.$t('W_001', { 'param': this.$t('templateName') }))
       //   return
       // }
 
 
       // if (this.displayNo == null) {
-      //   this.$Message.error(this.$t('W_001', { 'param': this.$t('displayNo') }))
+      //   this.$Message.warning(this.$t('W_001', { 'param': this.$t('displayNo') }))
       //   return
       // }
 
@@ -2095,7 +2095,7 @@ export default {
           }, 500)
         }
       } else {
-        this.$Message.error(res.message)
+        this.$Message.warning(res.message)
       }
       })
     },

src/components/business/process/node-modal/node-modal.vue

@@ -826,7 +826,7 @@ export default {
             this.setCurrentNodeId(undefined)
           } else {
             // 如果不成功就提示错误信息
-            this.$Message.error(res.message)
+            this.$Message.warning(res.message)
           }
         })
       }
@@ -841,7 +841,7 @@ export default {
       if (([this.$config.nodeKind.climbKiln, this.$config.nodeKind.uninstallKiln].includes(this.nodeData.nodeKind)
         || ([this.$config.nodeKind.inKiln, this.$config.nodeKind.outKiln].includes(this.nodeData.nodeKind) && this.nodeData.opnKind == '节点操作-载具码'))
         && !(this.$refs?.carTable?.getTableDataFilter() || []).length > 0) {
-        this.$Message.error(this.$t('W_061', { 'param': '载具' }))
+        this.$Message.warning(this.$t('W_061', { 'param': '载具' }))
         return false
       }
       // 工号类型可见才进行判断
@@ -853,7 +853,7 @@ export default {
           for (let i in userList) {
             if (userList[i].userId && !userList[i].userKind) {
               let rowsNo = 1 + parseInt(i)
-              this.$Message.error(this.$t('W_089', {
+              this.$Message.warning(this.$t('W_089', {
                 'param1': rowsNo + this.$t('rowNo'),
                 'param2': this.$t('userKind')
               }))
@@ -872,7 +872,7 @@ export default {
         (this.nodeData.nodeKind === this.$config.nodeKind.outKiln && this.nodeData.opnKind === this.$config.processType.kilnCode)) {
         let carTable = this.$refs.carTable?.getTableDataFilter()
         if (!carTable || carTable.length === 0) {
-          this.$Message.error(this.$t('W_042', {
+          this.$Message.warning(this.$t('W_042', {
             'param': this.$t('KilnCar')
           }))
           return

src/components/business/pull-cond/erp.vue

@@ -98,7 +98,7 @@ export default {
           this.$emit('ok')
           this.condition = this.cond
         } else {
-          this.$Message.error(res.message)
+          this.$Message.warning(res.message)
         }
         this.loading = false
       })

src/components/business/pull-cond/index.vue

@@ -145,7 +145,7 @@ export default {
             this.date = null
             this.currentPage = 1
           } else {
-            this.$Message.error(res.message)
+            this.$Message.warning(res.message)
           }
           this.loading = false
         })

src/components/business/search-cond/index.vue

@@ -527,7 +527,7 @@ export default {
      */
     SaveAsOkBtn() {
       if (!this.addFromData.pquName) {
-        this.$Message.error(vm.$t('inputWords', {'search-name': vm.$t('scenario')}))
+        this.$Message.warning(vm.$t('inputWords', {'search-name': vm.$t('scenario')}))
         return
       }
       let params = {}
@@ -551,7 +551,7 @@ export default {
           this.showModal = false
           this.$Message.success(vm.$t('I_002'))
         } else {
-          this.$Message.error(res.message)
+          this.$Message.warning(res.message)
         }
       })
 
@@ -637,7 +637,7 @@ export default {
             this.tableDataRight = res.data
             resolve()
           } else {
-            this.$Message.error(res.message)
+            this.$Message.warning(res.message)
           }
         })
       })
@@ -680,7 +680,7 @@ export default {
         if (res.code === 200) {
           this.setForm()
         } else {
-          this.$Message.error(res.message)
+          this.$Message.warning(res.message)
         }
       })
       this.showModal = false
@@ -709,7 +709,7 @@ export default {
           this.setForm()
           this.$Message.success(vm.$t('I_002'))
         } else {
-          this.$Message.error(res.message)
+          this.$Message.warning(res.message)
         }
       })
     },
@@ -783,7 +783,7 @@ export default {
             })
           })
         } else {
-          this.$Message.error(res.message)
+          this.$Message.warning(res.message)
         }
       })
     },
@@ -804,7 +804,7 @@ export default {
           })
           this.setLeftByRight()
         } else {
-          this.$Message.error(res.message)
+          this.$Message.warning(res.message)
         }
       })
     },

src/components/business/select-magnifier/select-magnifier.vue

@@ -57,6 +57,7 @@
                  :linkClickChecked="true"
                  :show-setting-flag="false"
                  :show-tip="true"
+                 :choose-data-flag="true"
                  :seq-tip-content="vm.$t('doubleSeq')"
                  @select-change="handleSelectChange"
                  @pageChange="pageSizeChange"
@@ -94,6 +95,7 @@
                :show-setting-flag="false"
                :show-tip="true"
                :seq-tip-content="vm.$t('doubleSeq')"
+               :choose-data-flag="true"
                :linkClickChecked="true" @pageChange="pageSizeChange"
                @chooseData="chooseData"
       >
@@ -280,7 +282,6 @@ export default {
       this.$emit('on-change', this.options)
     },
     displayText(n, o) {
-      console.log('n3444',n)
       this.selectedValue = n;
     },
     value(n, o) {
@@ -550,14 +551,14 @@ export default {
             this.$emit('on-input-blur', this.batchRowsPage)
             this.$emit('ok', this.batchRowsPage)
           } else {
-            this.$Message.error(this.$t('W_006'))
+            this.$Message.warning(this.$t('W_006'))
             this.$emit('on-input-blur', [])
             this.$emit('ok', [])
           }
         } else {
           this.$emit('on-input-blur', [])
           this.$emit('ok', [])
-          this.$Message.error(res.message)
+          this.$Message.warning(res.message)
         }
       })
     },
@@ -635,8 +636,8 @@ export default {
       // 不显示下拉时
       if (!this.selectFlag) {
         let display = []
-        for (let i = 0; i < this.$refs['table-select'].batchRows.length; i++) {
-          display.push(this.$refs['table-select'].batchRows[i][this.selectLabel])
+        for (let i = 0; i < this.batchRowsPage.length; i++) {
+          display.push(this.batchRowsPage[i][this.selectLabel])
         }
         this.selectedValue = display.join(',')
       }
@@ -655,6 +656,9 @@ export default {
     handleSelectChange(batchRows, row, checked) {
       if (row) {
         this.batchKeysPage = [...this.$refs['table-select'].batchKeys]
+        if(!this.batchRowsPage){
+          this.batchRowsPage = [...this.$refs['table-select'].batchRows]
+        }
         if (this.batchKeysPage) {
           let dataFinal = this.$refs['table-select'].dataFinal
           let filters = []
@@ -763,6 +767,7 @@ export default {
         if (res.code === this.$config.SUCCESS_CODE) {
           let arr = [...res.data.list]
           if (this.multiple) {
+            console.log('bbb',this.batchKeysPage,this.batchRowsPage)
             if (this.$refs['table-select'].batchKeys && this.$refs['table-select'].batchRows.length > 0) {
               arr.forEach(it => {
                 let batchKeysMuti = this.$refs['table-select'].batchKeys;
@@ -798,7 +803,7 @@ export default {
           this.$refs['table-select'].pageInfo.total = res.data.total
           this.loading = false;
         } else {
-          this.$Message.error(res.message)
+          this.$Message.warning(res.message)
           this.loading = false;
         }
       })
@@ -910,7 +915,7 @@ export default {
     checkBatch() {
       if (!this.batchKeysPage || this.batchKeysPage.length === 0) {
       // if (this.$refs['table-select'].batchKeys.length <= 0) {
-        this.$Message.error('请先选择数据')
+        this.$Message.warning('请先选择数据')
         return false
       }
       return true
@@ -1231,7 +1236,7 @@ export default {
         ]
         self.modalWidth = 600
         self.colCount = 2
-        self.selectKey = 'itemId'
+        self.selectKey = 'productId'
         self.selectLabel = 'pdtBarcode'
         self.columns = [
           {field: 'pdtBarcode', width: 'auto'},

src/components/business/table-select/table-select.vue

@@ -375,6 +375,7 @@ export default {
       },
       documentKeyDownContent: Object,
       children: [],//子级（已选列表）,
+      clickClearFlag:false,// 是否点击清空按钮
     }
   },
   watch: {
@@ -387,9 +388,9 @@ export default {
         // })
       }
     },
-    // text(n, o) {
-    //   this.inputModal = n
-    // },
+    text(n, o) {
+      this.inputModal = n
+    },
     options(n, o) {
       this.selectList = n
       this.optionsData = n ? JSON.parse(JSON.stringify(n)) : []
@@ -531,7 +532,7 @@ export default {
           //显示可替换的界面
           this.showChild = true;
         } else {
-          this.$Message.error(res.message)
+          this.$Message.warning(res.message)
         }
       })
     },
@@ -632,7 +633,11 @@ export default {
     handleInputBlur(e) {
       // this.inputModal = null;
       this.isChange = false;
-      this.$emit('on-input-blur', e)
+      // 点击清空不进行blur
+      if(!this.clickClearFlag){
+        this.$emit('on-input-blur', e)
+      }
+      this.clickClearFlag = false;
     },
     /**
      * @desc   : 清空数据
@@ -640,8 +645,11 @@ export default {
      * @date   : 2022/9/23 17:29
      */
     clearAll() {
+      this.clickClearFlag = true;
       this.inputModal = null;
-      this.$emit('clear')
+      this.$emit('clear');
+      // 清空后直接弹出下拉
+      this.$refs.input.$el.click();
     },
     /**
      * @desc   : 选择数据
@@ -652,6 +660,10 @@ export default {
       this.inputModal = row[this.label]
       this.$emit('change', row)
       this.$emit('onChoose', row)
+      // 关闭弹出框
+      if (this.dkEditTable) {
+        this.dkEditTable.closeAllPop();
+      }
       // this.$refs['input'].focus()
     },
     /**
@@ -811,7 +823,7 @@ export default {
           if (res.code === this.$config.SUCCESS_CODE) {
             this.selectList = res.data.list || res.data
           } else {
-            this.$Message.error(res.message)
+            this.$Message.warning(res.message)
           }
         })
       })
@@ -942,7 +954,7 @@ export default {
           }
           this.loading = false;
         } else {
-          this.$Message.error(res.message)
+          this.$Message.warning(res.message)
           this.loading = false;
         }
       })
@@ -1448,11 +1460,11 @@ export default {
     this.existsFlag = null
   },
   mounted() {
-    this.$nextTick(()=>{
+    this.$nextTick(() => {
       // 设置查询条件默认值
-      if(this.searchInitParam){
+      if (this.searchInitParam) {
         for (let it of Object.keys(this.searchInitParam)) {
-          this.$refs.searchCond.setDefault(it,this.searchInitParam[it].default,this.searchInitParam[it].valueKind)
+          this.$refs.searchCond.setDefault(it, this.searchInitParam[it].default, this.searchInitParam[it].valueKind)
         }
       }
     })

src/components/business/wangeditor/index.vue

@@ -92,7 +92,7 @@
           if (res.code === 200) {
             insertFn('http://' + 'localhost:5000//' + res.data.uuidName)
           } else {
-            this.$Message.error(res.message)
+            this.$Message.warning(res.message)
           }
         })
       },

src/components/hegii/VideoUpload/index.vue

@@ -85,7 +85,7 @@ export default {
         })
       }).catch(() => {
         this.upLoadImg = false
-        this.$message.error('删除失败')
+        this.$Message.warning('删除失败')
       })
     }
   }

src/components/main/components/side-menu/side-menu.vue

@@ -8,7 +8,7 @@
     </div>
     <slot></slot>
     <div v-show="!collapsed" style="width: 100%;text-align: center;margin-bottom: 20px;margin-top: 20px">
-      <Input v-model="menuName" clearable @on-enter="selectRoute"
+      <Input v-model="menuName" clearable @on-enter="selectRoute" @on-clear="selectRoute"
              class="search-menu" :placeholder="$t('inputWords', {'search-name': $t('functionName')})"/>
     </div>
     <Menu ref="menu" v-show="!collapsed" :active-name="activeName" :open-names="openedNames" :accordion="accordion"
@@ -130,7 +130,7 @@ export default {
       menuListData: [],
       collapsed: false,
       overTimer: null,
-      functionList : JSON.parse(sessionStorage.getItem('menu')),//获取初始路由
+      functionList: JSON.parse(sessionStorage.getItem('menu')),//获取初始路由
     }
   },
   methods: {
@@ -178,7 +178,7 @@ export default {
       this.overTimer ? clearTimeout(this.overTimer) : ''
       this.overTimer = setTimeout(() => {
         this.showDrawer(e, children)
-      }, 500)
+      }, 300)
       // setTimeout(() => {
       //   // console.log(this.mousePosition)
       //   if (!this.mousePosition.map(it => it.id).includes("side-menu-drawer")
@@ -315,11 +315,11 @@ export default {
      *   @date   : 2023/4/12 15:58
      *   @author : 寇珊珊
      */
-    setParentMenu(value){
+    setParentMenu(value) {
       //父级
       let middleRankList = this.functionList.filter(it => it.id === value.parentId)
-      let topLevelList=[]
-      for(let item of middleRankList){
+      let topLevelList = []
+      for (let item of middleRankList) {
         //父级的父级
         topLevelList = this.functionList.filter(it => it.id === item.parentId)
       }
@@ -334,9 +334,9 @@ export default {
     checkChildren(value) {
       let list = this.functionList.filter(it => it.parentId === value.id)
       let arr = []
-      for (let i of  list) {
+      for (let i of list) {
         //没有找到返回-1
-        if (i.name.indexOf(this.menuName)== -1) {
+        if (i.name.indexOf(this.menuName) == -1) {
           arr.push(i)
         }
       }
@@ -348,25 +348,30 @@ export default {
      *   @author : 寇珊珊
      */
     selectRoute() {
+      this.showCard = false;  // 关闭打开的菜单抽屉
       if (this.menuName) {
         let functionList = JSON.parse(sessionStorage.getItem('menu'))
         if (!functionList) return
+        // console.log('444', this.menuName, functionList)
+        // 如果查出导航，那么就要查出所有的子级 TODO
         let list = []
         for (let i of functionList) {
           //没有找到返回-1
-          if (i.name.indexOf(this.menuName)!= -1) {
+          if (i.name.indexOf(this.menuName) != -1) {
             //判断是否存在子级
             let checkChildrenList = this.checkChildren(i)
-            if(checkChildrenList.length==0){
-              list.push(i)
-            }
+            // if (checkChildrenList.length == 0) {
+            //   list.push(i)
+            // }
+            list.push(i)
             //父级赋值
             let arr = this.setParentMenu(i)
-            for(let i of arr){
+            for (let i of arr) {
               if (list.filter(it => it.id == i.id).length == 0) {
                 list.push(i)
               }
             }
+            // console.log('b', checkChildrenList, arr, list,i)
           }
         }
         if (list && list.length > 0) {

src/components/main/components/user/user.vue

@@ -309,7 +309,7 @@ export default {
               this.personalInfo.imagePath = res.data.relativePath
               this.personalInfo.imagePathType = 'AL-OSS'
             } else {
-              this.$Message.error(res.message)
+              this.$Message.warning(res.message)
             }
           })
         }
@@ -349,7 +349,7 @@ export default {
               //   },
               // });
             } else {
-              this.$Message.error(res.message)
+              this.$Message.warning(res.message)
             }
           })
         } else {
@@ -495,7 +495,7 @@ export default {
             // 返回规则校验结果
             resolve(!flag.some(s => !s))
           } else {
-            this.$Message.error(res.message)
+            this.$Message.warning(res.message)
           }
         })
       }))
@@ -538,7 +538,7 @@ export default {
         if (res.code === 200) {
           this.personalInfo = res.data
         } else {
-          this.$Message.error(res.message)
+          this.$Message.warning(res.message)
         }
       })
     },
@@ -556,12 +556,12 @@ export default {
       } else if (res.code === this.$config.ERROR_CODE_2009 || res.code === this.$config.ERROR_CODE_2011) {
         this.password.newPassword = ''
         this.password.confirmPassword = ''
-        this.$Message.error(res.message)
+        this.$Message.warning(res.message)
       } else if (res.code === this.$config.ERROR_CODE_2010) {
         this.password.oldPassword = ''
-        this.$Message.error(res.message)
+        this.$Message.warning(res.message)
       } else {
-        this.$Message.error(res.message)
+        this.$Message.warning(res.message)
       }
     },
     /**

src/components/sub/xm-select/index.vue

@@ -335,6 +335,7 @@ export default {
   display: block !important;
   overflow: hidden !important;
   font-size: 12px !important;
+  padding: 0 7px !important;
 }
 
 .more-class {

src/config/index.js

@@ -68,6 +68,7 @@ export default {
   maxlength: 100, // 文本类可输入的最大长度
   exportMax: 100000,// 导出的最大值
   pageSize: 10, // 一页数量
+  maxPageSize:10000000,// 最大数量
   fontSize: 12, // 字体大小
   maxTagCount: 2, // 下拉显示的默认数量
   maxDiscount: 999.99,//折扣的最大值

src/locale/lang/zh-CN.js

@@ -444,6 +444,7 @@ export const columns = {
   logoName: '商标名称',
   logoPaths: '商标图案',
   brandId: '品牌名称',
+  brandCodeLogo: '商品品牌',
 
   colourCode: '釉色编号',
   colourName: '釉色名称',
@@ -987,7 +988,7 @@ export const columns = {
   data: '值',
   paperType: '纸张类型',
   paperDirection: '纸张方向',
-
+  ownerFlag:'默认',
   web: 'WEB端',
   app: '移动端',
 }
@@ -1120,6 +1121,8 @@ export const messages = {
   W_149: '分组至少需要2条数据',
   W_150: '至少选择1条数据进行撤销',
   W_151: '该条数据不可以进行撤销条码操作',
+  W_153: '至少选择1条数据',
+  W_152: '载具最大装载数，0为无限制',
   E_001: '系统出现异常，请联系管理员。',
   Q_001: '当前页面的数据有过更改，请确认需要保存吗？',
   Q_002: '确定要进行{param}操作吗？',

src/mixins/form.js

@@ -284,7 +284,7 @@ export const formMixin = {
             }
           } else {
             // 如果不成功就提示错误信息
-            this.$Message.error(result.message)
+            this.$Message.warning(result.message)
           }
           this.loading = false
         });
@@ -408,7 +408,7 @@ export const formMixin = {
           this.setValuesByEdit(res.data)
           this.$emit('on-detail', res.data)
         } else {
-          this.$Message.error(res.message)
+          this.$Message.warning(res.message)
         }
         // // 如果不为空，那么需要把置为false
         // if (editPage) {

src/mixins/index.js

@@ -127,7 +127,7 @@ export const indexMixin = {
           // 查看当前行是否有数据
           let rows = this.$refs[tableRef].getCurrentRow();
           if (!rows) {
-            this.$Message.error(this.$t('W_013'))
+            this.$Message.warning(this.$t('W_013'))
             return;
           } else {
             chooseKeys = [rows[this.$refs[tableRef]._props.primaryKey]]
@@ -225,14 +225,14 @@ export const indexMixin = {
               && requiredColumns[i].valueFormat.code
               && (!this.searchCond._value[requiredColumns[i].valueFormat.code + 'Start']
                   || !this.searchCond._value[requiredColumns[i].valueFormat.code + 'End'])) {
-              this.$Message.error(this.$t('inputWords', {'search-name': requiredColumns[i].itemName}),)
+              this.$Message.warning(this.$t('inputWords', {'search-name': requiredColumns[i].itemName}),)
               return
             }
           }else{
             if (this.searchCond && this.searchCond._value && requiredColumns[i].valueFormat
               && requiredColumns[i].valueFormat.code
               && !this.searchCond._value[requiredColumns[i].valueFormat.code]) {
-              this.$Message.error(this.$t('inputWords', {'search-name': requiredColumns[i].itemName}),)
+              this.$Message.warning(this.$t('inputWords', {'search-name': requiredColumns[i].itemName}),)
               return
             }
           }
@@ -378,7 +378,7 @@ export const indexMixin = {
           }
           // else {
           //   // 如果不成功就提示错误信息
-          //   this.$Message.error(result.message)
+          //   this.$Message.warning(result.message)
           // }
           this.loading = false
         });
@@ -422,7 +422,7 @@ export const indexMixin = {
                 }
               } else {
                 if (t.message) {
-                  this.$Message.error(t.message)
+                  this.$Message.warning(t.message)
                 }
               }
             }
@@ -458,7 +458,7 @@ export const indexMixin = {
                   this.searchData();
                 }
               } else {
-                this.$Message.error(t.message)
+                this.$Message.warning(t.message)
               }
             }
           })
@@ -536,7 +536,7 @@ export const indexMixin = {
      */
     approval(apvSubmitId) {
       if (!apvSubmitId) {
-        this.$Message.error(this.$t('W_013'))
+        this.$Message.warning(this.$t('W_013'))
       }
       this.$IBMessage({
           content: '是否同意当前审批步骤？',
@@ -550,7 +550,7 @@ export const indexMixin = {
               if (res.code === 200) {
                 this.$Message.success(this.$t('I_001', {'param': this.$v('approve')}))
               } else {
-                this.$Message.error(res.message)
+                this.$Message.warning(res.message)
               }
             })
           },
@@ -559,7 +559,7 @@ export const indexMixin = {
               if (res.code === 200) {
                 this.$Message.success(this.$t('I_001', {'param': this.$v('approve')}))
               } else {
-                this.$Message.error(res.message)
+                this.$Message.warning(res.message)
               }
             })
           }

src/mixins/price.js

@@ -47,7 +47,7 @@ export const priceMixin = {
                   this.$Message.success(this.$t('I_001', {'param': this.$v('delete')}))
                   this.getEditTableData(this.$route.params.id)
                 } else {
-                  this.$Message.error(res.message)
+                  this.$Message.warning(res.message)
                 }
               })
             }
@@ -71,7 +71,7 @@ export const priceMixin = {
       } else if (response.code === -2) {
         this.addList = response.data?response.data.map(it=>Object.assign({pendingPrice:it.itemPrice},it)) : []
         let errList = response.message.split('|').map(it => it.split('-'))
-        this.$Message.error(
+        this.$Message.warning(
           {
             render: h => {
               return h('div', {style: {height: '20px'}}, [
@@ -90,7 +90,7 @@ export const priceMixin = {
           }
         )
       } else {
-        this.$Message.error(response.message)
+        this.$Message.warning(response.message)
       }
     },
     /**
@@ -118,7 +118,7 @@ export const priceMixin = {
             this.addFlag = false
             this.getEditTableData(this.$route.params.id)
           } else {
-            this.$Message.error(res.message)
+            this.$Message.warning(res.message)
           }
         })
       }
@@ -142,7 +142,7 @@ export const priceMixin = {
             this.updateFlag = false
             this.getEditTableData(this.$route.params.id)
           } else {
-            this.$Message.error(res.message)
+            this.$Message.warning(res.message)
           }
         })
       }

src/mixins/process.js

@@ -121,7 +121,7 @@ export const processMixin = {
     clickDetailUpload(){
       let selectRecords = this.$refs.table.getCheckboxRecords()
       if (selectRecords.length != 1) {
-        this.$Message.error('请选择一行明细')
+        this.$Message.warning('请选择一行明细')
         return
       }
       this.detailFileIndex = this.formData.detail.map(it => it.id).indexOf(selectRecords[0].id)
@@ -305,7 +305,7 @@ export const processMixin = {
     getDetailFiles(rowIndex){
       let selectRecords = this.$refs.table.getCheckboxRecords()
       if (selectRecords.length != 1) {
-        this.$Message.error('请选择一行明细')
+        this.$Message.warning('请选择一行明细')
         return
       }
       this.detailFileIndex = this.formData.detail.map(it => it.id).indexOf(selectRecords[0].id)
@@ -329,7 +329,7 @@ export const processMixin = {
     getBatchEditColumn(){
       let selectRecords = this.$refs.table.getCheckboxRecords()
       if (selectRecords.length == 0) {
-        this.$Message.error('请至少选择一行明细')
+        this.$Message.warning('请至少选择一行明细')
         return
       }
       this.editBatchModal = true
@@ -432,7 +432,7 @@ export const processMixin = {
       if (event.code == 200){
         this.formData.files.push(event.data)
       } else {
-        this.$Message.error(event.message)
+        this.$Message.warning(event.message)
       }
     },
     /**

src/view/core/factory/index.vue

@@ -195,7 +195,7 @@ export default {
     validData(){
       // 判断是否变更信息
       if(!this.formData.ftyDocNo || this.formData.ftyDocNo.length!=4) {
-        this.$Message.error(this.$t('W_147'))
+        this.$Message.warning(this.$t('W_147'))
         return false;
       }
       return true;

src/view/core/role/index.vue

@@ -259,7 +259,7 @@ export default {
         if (res.code == this.$config.SUCCESS_CODE) {
           this.users = res.data
         } else {
-          this.$Message.error(res.message)
+          this.$Message.warning(res.message)
         }
       })
     },

src/view/core/staff/index.vue

@@ -243,7 +243,7 @@ export default {
           }
         )
       } else {
-        this.$Message.error(this.$t('W_013'))
+        this.$Message.warning(this.$t('W_013'))
       }
     }
     ,
@@ -271,7 +271,7 @@ export default {
           this.userEditIdList = []
           this.userEditDataList = []
         } else {
-          this.$Message.error(res.message)
+          this.$Message.warning(res.message)
         }
       })
     },
@@ -335,7 +335,7 @@ export default {
           }
         });
       }else{
-        this.$Message.error(res.message)
+        this.$Message.warning(res.message)
       }
     },
     // endregion

src/view/core/system-setting/index.vue

@@ -45,9 +45,10 @@
             :show-setting-flag="false"
             :freeze="false"
             :choose-flag="false">
-            <DkTableColumn field="classCode" :title="$t('settingStyle')"  width="100"></DkTableColumn>
+            <DkTableColumn field="classCode" :title="$t('settingStyle')" width="100"></DkTableColumn>
             <DkTableColumn field="settingName" width="220"></DkTableColumn>
-            <vxe-column show-overflow="ellipsis" field="settingValue" width="100" height="100" min-width="80" class-name="setting-value-class"
+            <vxe-column show-overflow="ellipsis" field="settingValue" width="100" height="100" min-width="80"
+                        class-name="setting-value-class"
                         :title="$t('settingValue')"
             >
               <template #default="{ row }">
@@ -80,24 +81,24 @@
               </template>
 
             </vxe-column>
-<!--            <vxe-column show-overflow="ellipsis" field="settingDefault" width="100" height="100" min-width="80"-->
-<!--                        :title="$t('settingDefault')"-->
-<!--            >-->
-<!--              <template #default="{ row }">-->
-<!--                &lt;!&ndash;数字类型&ndash;&gt;-->
-<!--                <vxe-input v-if="row.valueKind == 'INT' || row.valueKind == 'NUM'" size="mini" :disabled=true-->
-<!--                           v-model="row.settingDefault"></vxe-input>-->
-<!--                &lt;!&ndash;文本类型&ndash;&gt;-->
-<!--                <vxe-input v-if="row.valueKind == 'STR'" :disabled=true-->
-<!--                           size="mini" v-model="row.settingDefault"></vxe-input>-->
-<!--                &lt;!&ndash;下拉框类型&ndash;&gt;-->
-<!--                <vxe-input v-if="row.valueKind == 'S-CHOICE'" :disabled=true-->
-<!--                           size="mini" v-model="row.settingDefault"></vxe-input>-->
-<!--                &lt;!&ndash;布尔类型&ndash;&gt;-->
-<!--                <i-switch size="small" :disabled=true v-if="row.valueKind == 'BOOL'"-->
-<!--                          v-model="row.settingDefault"></i-switch>-->
-<!--              </template>-->
-<!--            </vxe-column>-->
+            <!--            <vxe-column show-overflow="ellipsis" field="settingDefault" width="100" height="100" min-width="80"-->
+            <!--                        :title="$t('settingDefault')"-->
+            <!--            >-->
+            <!--              <template #default="{ row }">-->
+            <!--                &lt;!&ndash;数字类型&ndash;&gt;-->
+            <!--                <vxe-input v-if="row.valueKind == 'INT' || row.valueKind == 'NUM'" size="mini" :disabled=true-->
+            <!--                           v-model="row.settingDefault"></vxe-input>-->
+            <!--                &lt;!&ndash;文本类型&ndash;&gt;-->
+            <!--                <vxe-input v-if="row.valueKind == 'STR'" :disabled=true-->
+            <!--                           size="mini" v-model="row.settingDefault"></vxe-input>-->
+            <!--                &lt;!&ndash;下拉框类型&ndash;&gt;-->
+            <!--                <vxe-input v-if="row.valueKind == 'S-CHOICE'" :disabled=true-->
+            <!--                           size="mini" v-model="row.settingDefault"></vxe-input>-->
+            <!--                &lt;!&ndash;布尔类型&ndash;&gt;-->
+            <!--                <i-switch size="small" :disabled=true v-if="row.valueKind == 'BOOL'"-->
+            <!--                          v-model="row.settingDefault"></i-switch>-->
+            <!--              </template>-->
+            <!--            </vxe-column>-->
             <DkTableColumn field="settingDescription" width="auto"></DkTableColumn>
           </DkTable>
         </div>
@@ -196,6 +197,7 @@ export default {
      * @date   : 2022/3/5 8:51
      */
     currentChangeEvent({row}) {
+      console.log('444')
       // 获取当前行数据
       // 值发生变化的保存 valueChangeFlg为true值发生变化
       let list = this.tableRightData.filter(it => it.valueChangeFlg == true)
@@ -216,10 +218,10 @@ export default {
               }
             },
             cancel: () => {
-              if (row != null) {
-                //查询租户系统参数列表的数据-右侧列表
-                this.getSettingData(row.classCode)
-              }
+              // if (row != null) {
+              //   //查询租户系统参数列表的数据-右侧列表
+              //   this.getSettingData(row.classCode)
+              // }
             }
           })
       } else {
@@ -242,7 +244,7 @@ export default {
       if (list && list.length > 0) {
         for (let i = 0; i < list.length; i++) {
           if (list[i].valueChangeFlg && !(list[i].valueKind == 'BOOL' || list[i].valueKind == 'S-CHOICE') && !list[i].settingValue) {
-            this.$Message.error(this.$t('W_089', {'param1': (i + 1), 'param2': "参数值"}) )
+            this.$Message.warning(this.$t('W_089', {'param1': (i + 1), 'param2': "参数值"}))
             return false;
           }
         }
@@ -339,7 +341,7 @@ export default {
           }
           this.loading = false;
         })
-      }else{
+      } else {
         this.loading = false;
       }
     },
@@ -382,21 +384,19 @@ export default {
             if (it.valueKind == 'S-CHOICE') {
 
               //循环同步数据源key值类型 和系统参数、默认值 值类型
-              it.valueFormat.items.forEach(str =>{
-                str.key=String(str.key);
+              it.valueFormat.items.forEach(str => {
+                str.key = String(str.key);
               })
               // 当前值
               let arraySettingValue = it.valueFormat.items.filter(iv => iv.key == it.settingValue)
               // 默认值
               let arraySettingDefault = it.valueFormat.items.filter(iv => iv.key == it.settingDefault)
-              if(arraySettingValue.length>0)
-              {
+              if (arraySettingValue.length > 0) {
                 it.settingValue = arraySettingValue[0].value
               }
-             if(arraySettingDefault.length>0)
-             {
-               it.settingDefault = arraySettingDefault[0].value
-             }
+              if (arraySettingDefault.length > 0) {
+                it.settingDefault = arraySettingDefault[0].value
+              }
 
             }
 
@@ -404,7 +404,7 @@ export default {
             it.settingValueBack = it.settingValue
             this.tableRightList.push(it)
           })
-          this.tableRightData=this.tableRightList;
+          this.tableRightData = this.tableRightList;
           // 参数列表的数据-右侧列表-选中第一行
           if (this.tableRightData && this.tableRightData.length > 0) {
             this.$refs.rightTable.setCurrentRow(this.tableRightData[0])
@@ -421,14 +421,15 @@ export default {
    * @date   : 2022/3/3 10:32
    */
   created() {
-    this.pageFlag=false;
+    this.pageFlag = false;
+    this.initSearchFlag = true;
   },
 }
 </script>
 
 <style scoped>
 
-/deep/.setting-value-class .vxe-cell{
+/deep/ .setting-value-class .vxe-cell {
   padding-left: 0 !important;
   padding-right: 0 !important;
   display: flex !important;
@@ -436,7 +437,7 @@ export default {
   justify-content: center;
 }
 
-/deep/.vxe-input--inner{
+/deep/ .vxe-input--inner {
   text-align: center !important;
   padding: 0 !important;
 }

src/view/core/user/form.vue

@@ -496,7 +496,7 @@ export default {
     validData() {
       // 判断是否有工种信息
       if (this.prodUserFlag && (!this.formData.workTeamList || this.formData.workTeamList.filter(f=>f.jobId).length === 0)) {
-       this.$Message.error(this.$t('W_093', {param: this.$t('job')}))
+       this.$Message.warning(this.$t('W_093', {param: this.$t('job')}))
        return false;
       }
       // 判断工种对应的员工信息是否为空
@@ -504,7 +504,7 @@ export default {
         let it = this.formData.workTeamList[index]
         let rows = 1 + parseInt(index);
         if(it.jobId > 0 && (!it.staffList || it.staffList.length === 0)){
-          this.$Message.error(this.$t('W_089', {
+          this.$Message.warning(this.$t('W_089', {
             'param1': rows + this.$t('rowNo') ,
             'param2': this.$t('staffNames')
           }))
@@ -517,7 +517,7 @@ export default {
         if (it.jobId > 0 && it.staffList){
           let list = it.staffList.filter(item=>item.flgDefaultStaff);
           if (!list || list.length != 1){
-            this.$Message.error(this.$t('W_069', {
+            this.$Message.warning(this.$t('W_069', {
               'param': this.$t('sequence') + rows + this.$t('rowNo') + this.$t('flgDefaultStaff')
             }))
             this.setErrToRow(it, this.$t('W_093', {

src/view/core/user/index.vue

@@ -148,14 +148,14 @@ export default {
                 if (res.code === this.$config.SUCCESS_CODE) {
                   this.$Message.success(this.$t('I_001', {'param': this.$v('resetPassword')}))
                 } else {
-                  this.$Message.error(res.message)
+                  this.$Message.warning(res.message)
                 }
               })
             },
           }
         )
       } else {
-        this.$Message.error(this.$t('W_013'))
+        this.$Message.warning(this.$t('W_013'))
       }
     }
     ,
@@ -185,13 +185,13 @@ export default {
                 if (res.code === this.$config.SUCCESS_CODE) {
                   this.$Message.success(this.$t('I_001', {'param': this.$v('unLock')}))
                 } else {
-                  this.$Message.error(res.message)
+                  this.$Message.warning(res.message)
                 }
               })
             },
           })
       } else {
-        this.$Message.error(this.$t('W_013'))
+        this.$Message.warning(this.$t('W_013'))
       }
     },
 
@@ -215,13 +215,13 @@ export default {
                 if (res.code === this.$config.SUCCESS_CODE) {
                   this.$Message.success(res.data)
                 } else {
-                  this.$Message.error(res.message)
+                  this.$Message.warning(res.message)
                 }
               })
             },
           })
       } else {
-        this.$Message.error(this.$t('W_013'))
+        this.$Message.warning(this.$t('W_013'))
       }
     },
     /**
@@ -244,13 +244,13 @@ export default {
                 if (res.code === this.$config.SUCCESS_CODE) {
                   this.$Message.success(res.data)
                 } else {
-                  this.$Message.error(res.message)
+                  this.$Message.warning(res.message)
                 }
               })
             },
           })
       } else {
-        this.$Message.error(this.$t('W_013'))
+        this.$Message.warning(this.$t('W_013'))
       }
     },
     /**

src/view/core/user/purview-multiple.vue

@@ -241,7 +241,7 @@ export default {
       //         if (res.code === 200) {
       //           this.$Message.success(this.$t('I_001', { 'param': this.$v('save') }))
       //         } else {
-      //           this.$Message.error(res.message)
+      //           this.$Message.warning(res.message)
       //         }
       //       })
       //     }
@@ -1142,7 +1142,7 @@ export default {
         this.operatingOrganizationData = res2.data
         this.viewOrganizationData = res2.data
       } else {
-        this.$Message.error(res2.message)
+        this.$Message.warning(res2.message)
         this.loading = false
       }
       // })
@@ -1725,7 +1725,7 @@ export default {
         //商品一览表
         this.checkStaffsTableData = res.data.list
       } else {
-        this.$message.error(res.message)
+        this.$Message.warning(res.message)
       }
       this.loading = false
       // })

src/view/core/user/purview.vue

@@ -212,7 +212,7 @@ export default {
           // this.closeTag(this.$route)
           this.getPurview()
         } else {
-          this.$Message.error(res.message)
+          this.$Message.warning(res.message)
         }
       })
     },
@@ -605,7 +605,7 @@ export default {
             this.getByUser()
           })
         } else {
-          this.$Message.error(res.message)
+          this.$Message.warning(res.message)
         }
         this.loading = false
       })
@@ -632,7 +632,7 @@ export default {
 
           }
         } else {
-          this.$Message.error(res.message)
+          this.$Message.warning(res.message)
         }
       })
     },
@@ -658,7 +658,7 @@ export default {
           //查询所有tab页所有数据源
           this.getData()
         } else {
-          this.$Message.error(res.message)
+          this.$Message.warning(res.message)
         }
         this.loading = false
       })
@@ -675,7 +675,7 @@ export default {
         if(res.code === 200){
           this.staffList = res.data.filter(it=>idList.includes(it.userId))
         } else {
-          this.$Message.error(res.message)
+          this.$Message.warning(res.message)
         }
       })
     }

src/view/login/login.vue

@@ -132,7 +132,7 @@ export default {
           })
         } else {
           let message = res.message
-          this.$Message.error({content: message})
+          this.$Message.warning({content: message})
         }
         this.loading = false
       })

src/view/login/qv-login.vue

@@ -34,7 +34,7 @@ export default {
             name: this.$config.homeName
           })
         } else {
-          this.$Message.error(res.message)
+          this.$Message.warning(res.message)
           this.$router.push({
             name: this.$route.query.state
           })

src/view/mst/carr-kiln-car/index.vue

@@ -382,11 +382,11 @@ export default {
         if(this.carList.length>0){
           for(let it of this.carList){
             if(!it.carNo){
-              this.$message.error(this.$t('Q_009'))
+              this.$Message.warning(this.$t('Q_009'))
               return
             }
             if(!it.modelId){
-              this.$message.error(this.$t('Q_011'))
+              this.$Message.warning(this.$t('Q_011'))
               return
             }
             if(it.uniqueId){
@@ -398,7 +398,7 @@ export default {
           }
         }
         if(this.editList.length <= 0 && this.addList.length <= 0){
-          this.$message.error(this.$t('W_039'))
+          this.$Message.warning(this.$t('W_039'))
           return
         }
         // 保存方法
@@ -412,7 +412,7 @@ export default {
             this.searchData(); // 重新触发查询
             this.clear();
           } else {
-            this.$message.error(res.message)
+            this.$Message.warning(res.message)
           }
           this.addList = []
           this.editList = []

src/view/mst/custom-report/form.vue

@@ -678,7 +678,7 @@ export default {
             sqlScriptTemp.indexOf('delete') >= 0 || sqlScriptTemp.indexOf('create') >= 0 ||
             sqlScriptTemp.indexOf('alter') >= 0 || sqlScriptTemp.indexOf('GRANT') >= 0 ||
             sqlScriptTemp.indexOf('REVOKE') >= 0) {
-            this.$Message.error(this.$t('sqlErr'))
+            this.$Message.warning(this.$t('sqlErr'))
             return
           }
           this.$set(this.currentRow, 'sqlScript', sqlScript)
@@ -879,12 +879,12 @@ export default {
      */
     validDataItem() {
       if (!this.sqlTabsOptions[this.sqlIndex].sqlScript) {
-        this.$Message.error(this.$t('W_042', {'param': this.$t('sqlScript')}))
+        this.$Message.warning(this.$t('W_042', {'param': this.$t('sqlScript')}))
         return false;
       }
       // 校验sql中是否有工厂Id作为条件
       if (this.sqlTabsOptions[this.sqlIndex].sqlScript.indexOf('#{ftyId}') < 0) {
-        this.$Message.error('SQL中不包括工厂Id')
+        this.$Message.warning('SQL中不包括工厂Id')
         return false;
       }
       return true;
@@ -1148,19 +1148,19 @@ export default {
           this.clearRowErr(it);
           // 类型必须输入
           if (!it.kind) {
-            this.$Message.error(this.$t('W_089', {'param1': (i + 1), 'param2': this.$t('reportType')}))
+            this.$Message.warning(this.$t('W_089', {'param1': (i + 1), 'param2': this.$t('reportType')}))
             this.setErrToRow(it, this.$t('W_042', {'param': this.$t('reportType')}))
             return false;
           }
           // 编码必须输入
           if (!it.code) {
-            this.$Message.error(this.$t('W_089', {'param1': (i + 1), 'param2': this.$t('code')}))
+            this.$Message.warning(this.$t('W_089', {'param1': (i + 1), 'param2': this.$t('code')}))
             this.setErrToRow(it, this.$t('W_042', {'param': this.$t('code')}))
             return false;
           }
           // 名称必须输入
           if (!it.name) {
-            this.$Message.error(this.$t('W_089', {'param1': (i + 1), 'param2': this.$t('name')}))
+            this.$Message.warning(this.$t('W_089', {'param1': (i + 1), 'param2': this.$t('name')}))
             this.setErrToRow(it, this.$t('W_042', {'param': this.$t('name')}))
             return false;
           }
@@ -1169,7 +1169,7 @@ export default {
             it.kind === this.$config.reportKind.multiple) {
             // 如果数据源为空提示
             if (!it.sqlScript) {
-              this.$Message.error(this.$t('W_089', {'param1': (i + 1), 'param2': this.$t('sqlScript')}))
+              this.$Message.warning(this.$t('W_089', {'param1': (i + 1), 'param2': this.$t('sqlScript')}))
               this.setErrToRow(it, this.$t('W_042', {'param': this.$t('sqlScript')}))
               return false;
             } else {
@@ -1180,7 +1180,7 @@ export default {
                 sqlScript.indexOf('delete') >= 0 || sqlScript.indexOf('create') >= 0 ||
                 sqlScript.indexOf('alter') >= 0 || sqlScript.indexOf('grant') >= 0 ||
                 sqlScript.indexOf('revoke') >= 0) {
-                this.$Message.error(this.$t('sqlErr'))
+                this.$Message.warning(this.$t('sqlErr'))
                 return false;
               }
               await this.excuteSql(it.sqlScript).then(t => {
@@ -1205,13 +1205,13 @@ export default {
         // region 2、验证sql
         if (!sqlItem.sqlScript) {
           // 表格设置不能为空
-          this.$Message.error(this.$t('W_042', {'param': this.$t('sqlScript')}))
+          this.$Message.warning(this.$t('W_042', {'param': this.$t('sqlScript')}))
           flag = false;
           return false;
         }
         // 校验sql中是否有工厂Id作为条件
         if (sqlItem.sqlScript.indexOf('#{ftyId}') < 0) {
-          this.$Message.error('SQL中不包括工厂Id')
+          this.$Message.warning('SQL中不包括工厂Id')
           flag = false;
           return false;
         }
@@ -1234,7 +1234,7 @@ export default {
         let tableSettingData = sqlItem.tableSettingList;
         if (!tableSettingData || tableSettingData.length === 0) {
           // 表格设置不能为空
-          this.$Message.error(this.$t('W_042', {'param': this.$t('tableSetting')}))
+          this.$Message.warning(this.$t('W_042', {'param': this.$t('tableSetting')}))
           flag = false;
           return false;
         }
@@ -1244,14 +1244,14 @@ export default {
           this.clearRowErr(it);
           // 编码必须输入
           if (!it.code) {
-            this.$Message.error(this.$t('W_089', {'param1': (i + 1), 'param2': this.$t('code')}))
+            this.$Message.warning(this.$t('W_089', {'param1': (i + 1), 'param2': this.$t('code')}))
             this.setErrToRow(it, this.$t('W_042', {'param': this.$t('code')}))
             flag = false;
             return false;
           }
           // 名称必须输入
           if (!it.name) {
-            this.$Message.error(this.$t('W_089', {'param1': (i + 1), 'param2': this.$t('name')}))
+            this.$Message.warning(this.$t('W_089', {'param1': (i + 1), 'param2': this.$t('name')}))
             this.setErrToRow(it, this.$t('W_042', {'param': this.$t('name')}))
             flag = false;
             return false;

src/view/mst/custom-report/index.vue

@@ -268,11 +268,11 @@ export default {
      */
     preview(rows) {
       if (rows[0].reportType === this.$config.reportType.app) {
-        this.$Message.error(this.$t('W_134'))
+        this.$Message.warning(this.$t('W_134'))
         return
       }
       if (rows[0].reportStatus === this.$config.reportStatus.temp) {
-        this.$Message.error(this.$t('W_135'))
+        this.$Message.warning(this.$t('W_135'))
         return
       }
       return this.handleLink(Object.assign(rows[0], {url: '/mst/custom-report/report/custom-report-detail-' + rows[0].reportId}))

src/view/mst/label-print-layout/setting.vue

@@ -49,7 +49,7 @@ export default {
           this.$Message.success(res.message)
           this.$emit('close')
         } else {
-          this.$Message.error(res.message)
+          this.$Message.warning(res.message)
         }
       })
     },
@@ -127,7 +127,7 @@ export default {
       //     this.editRow = res.data
       //     this.loading = false
       //   } else {
-      //     this.$Message.error(res.message)
+      //     this.$Message.warning(res.message)
       //     this.loading = false
       //   }
       // })

src/view/mst/model-mould-change/index.vue

@@ -537,7 +537,7 @@ export default {
       } else if (this.modalParams.button !== this.$config.formMode.add && val < tableLength) {
         // 编辑，提示产出明细不可减少
         if (val < this.formData.outputQtyOrigin) {
-          this.$Message.error(this.$t('W_090'))
+          this.$Message.warning(this.$t('W_090'))
           this.formData.outputQty = this.formData.outputQtyOrigin
           for (let i = 0; i < tableLength - this.formData.outputQtyOrigin; i++) {
             this.$refs.pdtModelTable.del(tableLength - 1 - i)

src/view/mst/model-product/form.vue

@@ -553,26 +553,26 @@ export default {
 
           //logo 商标
           if (!this.formData.erpList[i].logoId) {
-            this.$Message.error('产品erp型号：' + this.$t('W_089', {'param1': (i + 1), 'param2': "商标"}) + ';')
+            this.$Message.warning('产品erp型号：' + this.$t('W_089', {'param1': (i + 1), 'param2': "商标"}) + ';')
             return false;
           }
           //colour 釉色
           if (!this.formData.erpList[i].colourId) {
-            this.$Message.error('产品erp型号：' + this.$t('W_089', {'param1': (i + 1), 'param2': "釉色"}) + ';')
+            this.$Message.warning('产品erp型号：' + this.$t('W_089', {'param1': (i + 1), 'param2': "釉色"}) + ';')
             return false;
           }
 
           //todo 暂时注释 以后可能会有改动 2023年4月21日15:40:18
           //erpModelCode erp物料编码   商标釉色都有时物料编码为必输(2023年4月21日15:39:12)
           // if (this.formData.erpList[i].colourId && this.formData.erpList[i].logoId && this.formData.erpList[i].erpModelCode) {
-          //   this.$Message.error('产品erp型号：' + this.$t('W_089', {'param1': (i + 1), 'param2': "erp物料编码"}) + ';')
+          //   this.$Message.warning('产品erp型号：' + this.$t('W_089', {'param1': (i + 1), 'param2': "erp物料编码"}) + ';')
           //   return false;
           // }
 
           //todo 产品型号bom
           // if (!this.formData.erpList[i].bomList || this.formData.erpList[i].bomList.length === 0) {
           //   let msg = '未选择员工信息'
-          //   this.$message.error('第' + (i + 1) + '条工种数据未选择员工信息')
+          //   this.$Message.warning('第' + (i + 1) + '条工种数据未选择员工信息')
           //   this.setErrToRow(this.formData.erpList[i], msg);// 给行增加错误提示信息
           //   return false;
           // }
@@ -580,12 +580,12 @@ export default {
           // for ( let a=0 ;a<bomArray.length;a++){
           //   //bomModelKind 子件类型
           //   if(!bomArray[a].bomModelKind){
-          //     this.$Message.error('产品型号bom：' + this.$t('W_089', {'param1': (a + 1), 'param2': "子件类型"}) + ';')
+          //     this.$Message.warning('产品型号bom：' + this.$t('W_089', {'param1': (a + 1), 'param2': "子件类型"}) + ';')
           //     return false;
           //   }
           //   //bomModelQty  子件数量
           //   if(!bomArray[a].bomModelQty||bomArray[a].bomModelQty<=0){
-          //     this.$Message.error('产品型号bom：' + this.$t('W_089', {'param1': (a + 1), 'param2': "子件数量"}) + ';')
+          //     this.$Message.warning('产品型号bom：' + this.$t('W_089', {'param1': (a + 1), 'param2': "子件数量"}) + ';')
           //     return false;
           //   }
           // }

src/view/mst/model/index.vue

@@ -35,7 +35,8 @@
                :height="tableHeight" primaryKey="modelId"
                :choose-flag="false"
                @pageChange="pageSizeChange">
-        <DkTableColumn field="modelCode" type="link" @on-link="handleLink(Object.assign($event,{button:'edit'}))"></DkTableColumn>
+        <DkTableColumn field="modelCode" type="link"
+                       @on-link="handleLink(Object.assign($event,{button:'edit'}))"></DkTableColumn>
         <DkTableColumn field="modelName"></DkTableColumn>
         <DkTableColumn field="modelCategoryName"></DkTableColumn>
         <DkTableColumn field="limitLoadQty" v-if="this.formType==$config.formCode.modelCarrier"></DkTableColumn>
@@ -59,7 +60,8 @@
                :choose-flag="false" @current-change="changeCurrent"
                @pageChange="pageSizeChange"
       >
-        <DkTableColumn field="modelCode"  type="link" @on-link="handleLink(Object.assign($event,{button:'edit'}))"></DkTableColumn>
+        <DkTableColumn field="modelCode" type="link"
+                       @on-link="handleLink(Object.assign($event,{button:'edit'}))"></DkTableColumn>
         <DkTableColumn field="modelName"></DkTableColumn>
         <DkTableColumn field="modelCategoryName"></DkTableColumn>
         <DkTableColumn field="limitLoadQty" v-if="this.formType==$config.formCode.modelCarrier"></DkTableColumn>
@@ -99,7 +101,8 @@
               :label-max-words="this.formType==$config.formCode.modelCarrier?5:4">
         <!--  型号编码  -->
         <DkFormItem prop="modelCode" required>
-          <InputPop v-model="formData.modelCode" ref="modelCode" :readonly="formType==$config.formCode.modelMould && modalParams.button == $config.formMode.edit"/>
+          <InputPop v-model="formData.modelCode" ref="modelCode"
+                    :readonly="formType==$config.formCode.modelMould && modalParams.button == $config.formMode.edit"/>
         </DkFormItem>
         <!--  型号名称  -->
         <DkFormItem prop="modelName" required>
@@ -119,12 +122,10 @@
         <!--   限制装载量    -->
         <DkFormItem prop="limitLoadQty" :required="true" :data-type="$config.dataType.number"
                     v-if="this.formType==$config.formCode.modelCarrier">
-          <InputNumberPop v-model="formData.limitLoadQty" :min=0 :clearable="false" />
+          <InputNumberPop v-model="formData.limitLoadQty" :min=0 :clearable="false"/>
         </DkFormItem>
-
-        <!--   区域内唯一    -->
-        <DkFormItem prop="flgRangeOnly" :required=false v-if="this.formType==$config.formCode.modelCarrier">
-          <DkSwitch v-model="formData.flgRangeOnly" :clearable="false"></DkSwitch>
+        <DkFormItem v-if="this.formType==$config.formCode.modelCarrier">
+          <span style="line-height: 20px;">{{$t('W_152')}}</span>
         </DkFormItem>
 
         <!--   标准次数     -->
@@ -138,7 +139,19 @@
                     v-if="formType==$config.formCode.modelMould">
           <InputNumberPop v-model="formData.outputQty" :clearable="false" @on-blur="outputQtyBlur"
                           :readonly="modalParams.button == $config.formMode.edit"
-                          :min="1" :max="9+1"/>
+                          :min="1" :max="10"/>
+        </DkFormItem>
+
+        <!--  产品型号 -->
+        <DkFormItem prop="outputList" v-if="formType==$config.formCode.modelMould && formData.outputQty == 1"
+                    :required="formType==$config.formCode.modelMould && formData.outputQty == 1"
+                    :data-type="$config.dataType.array" :label="$t('pdtModelId')">
+          <MultiSelect v-model="formData.outputList"
+                       main-field="ownerFlag"
+                       :default-value="formData.outputListName"
+                       @ok="getPdtModel"
+                       :type="this.$config.MagnifierType.product"
+          ></MultiSelect>
         </DkFormItem>
 
         <!--   备注     -->
@@ -146,50 +159,66 @@
           <InputPop v-model="formData.remarks" textareaFlag/>
         </DkFormItem>
 
+        <!--   区域内唯一    -->
+        <DkFormItem prop="flgRangeOnly" :required=false v-if="this.formType==$config.formCode.modelCarrier">
+          <DkSwitch v-model="formData.flgRangeOnly" :clearable="false"></DkSwitch>
+        </DkFormItem>
       </DkForm>
 
       <!--      产出型号-->
-      <div style="padding: 10px 17px 10px 10px; height: 100px" v-if="formType==$config.formCode.modelMould">
+      <div style="padding: 10px 17px 10px 10px; height: 150px"
+           v-if="formType==$config.formCode.modelMould && formData.outputQty > 1">
+        <EditTable ref="pdtModelTable" :data="moreOutputList"
+                   :columns="outputColumn"
+                   :height="140"
+                   :show-setting-flag="false"
+                   :freeze="false"
+                   enabled-repeat-id="modelId"
+                   controlId="pdtModelId"
+                   :enabledRepeat="false"
+                   :operate-flag="false"
+                   @chooseData="chooseData"
+        ></EditTable>
         <!--        <EditTable ref="pdtModelTable" :data="formData.outputList" :show-setting-flag="false"-->
         <!--                   :enabledRepeat=true :enabled-repeat-id="'userId'" :add-flag="false" :delete-flag="false"-->
         <!--                   :columns="outputColumn" :height="100"></EditTable>-->
 
-        <DkSplit v-model="formSplit">
-          <!--左侧产品型号信息-->
-          <EditTable slot="left" ref="pdtModelTable" :data="formData.outputList"
-                     :columns="outputColumn"
-                     :height="100"
-                     :show-setting-flag="false"
-                     :freeze="false"
-                     enabled-repeat-id="modelId"
-                     controlId="pdtModelId"
-                     :enabledRepeat="false"
-                     :readonly="modalParams.button == $config.formMode.edit"
-                     @current-change="changeCurrentPdt"
-                     @chooseData="chooseData"
-                     @addRow="addPdtRow"
-                     @delRow="delPdtRow"
-                     :add-flag="false" :delete-flag="false"
-          ></EditTable>
-          <!--右侧可变更产品型号信息-->
-          <EditTable slot="right" ref="repPdtModelTable"
-                     :columns="repOutputColumn"
-                     :height="100"
-                     :show-setting-flag="false"
-                     enabledRepeatId="modelId"
-                     :enabledRepeat="false"
-                     :freeze="false"
-                     :readonly="modalParams.button == $config.formMode.edit"
-                     controlId="repPdtModelId"
-                     :data="formData.outputList
-                                  &&formData.outputList.length>0
-                                  &&formData.outputList[modelMouldIndex]
-                                  ?formData.outputList[modelMouldIndex].repPdtModelList:[]"
-                     @chooseData="chooseRepPdtModel"
-                     @onBatchChoose="chooseRepPdtModel"
-                     @delRow="delRepPdtModelRow"
-          ></EditTable>
-        </DkSplit>
+        <!--        <DkSplit v-model="formSplit">-->
+        <!--          &lt;!&ndash;左侧产品型号信息&ndash;&gt;-->
+        <!--          <EditTable slot="left" ref="pdtModelTable" :data="formData.outputList"-->
+        <!--                     :columns="outputColumn"-->
+        <!--                     :height="100"-->
+        <!--                     :show-setting-flag="false"-->
+        <!--                     :freeze="false"-->
+        <!--                     enabled-repeat-id="modelId"-->
+        <!--                     controlId="pdtModelId"-->
+        <!--                     :enabledRepeat="false"-->
+        <!--                     :readonly="modalParams.button == $config.formMode.edit"-->
+        <!--                     @current-change="changeCurrentPdt"-->
+        <!--                     @chooseData="chooseData"-->
+        <!--                     @addRow="addPdtRow"-->
+        <!--                     @delRow="delPdtRow"-->
+        <!--                     :add-flag="false" :delete-flag="false"-->
+        <!--          ></EditTable>-->
+        <!--          &lt;!&ndash;右侧可变更产品型号信息&ndash;&gt;-->
+        <!--          <EditTable slot="right" ref="repPdtModelTable"-->
+        <!--                     :columns="repOutputColumn"-->
+        <!--                     :height="100"-->
+        <!--                     :show-setting-flag="false"-->
+        <!--                     enabledRepeatId="modelId"-->
+        <!--                     :enabledRepeat="false"-->
+        <!--                     :freeze="false"-->
+        <!--                     :readonly="modalParams.button == $config.formMode.edit"-->
+        <!--                     controlId="repPdtModelId"-->
+        <!--                     :data="formData.outputList-->
+        <!--                                  &&formData.outputList.length>0-->
+        <!--                                  &&formData.outputList[modelMouldIndex]-->
+        <!--                                  ?formData.outputList[modelMouldIndex].repPdtModelList:[]"-->
+        <!--                     @chooseData="chooseRepPdtModel"-->
+        <!--                     @onBatchChoose="chooseRepPdtModel"-->
+        <!--                     @delRow="delRepPdtModelRow"-->
+        <!--          ></EditTable>-->
+        <!--        </DkSplit>-->
       </div>
       <!--   装载区域    -->
       <div style="padding: 10px 17px 10px 10px" v-if="this.formType==$config.formCode.modelCarrier">
@@ -237,9 +266,11 @@ export default {
         stdNum: 1,
         outputQty: 1,
         outputList: [],
+        outputListName: '',
         rangeList: [],//装载区域
         delRangeList: [],//删除数据库中装载区域集合
       },
+      moreOutputList: [],// 多个
       // 模具分类数据
       categoryList: [],
       // 查询条件
@@ -256,13 +287,10 @@ export default {
       modelMouldIndex: -1, // 产品型号当前行号
       outputColumn: [
         {
-          field: 'pdtModelName',
+          field: 'pdtModelId',
           controlId: 'pdtModelId',
-          width: 150,
-          type: 'tableSelect',
-          param: () => {
-            return {}
-          },
+          width: 'auto',
+          type: 'multiSelect',
           sortBoolean: false,
           dataType: self.$config.tableSelectType.product,
           fieldUpdate: self.$updateColumns.modelChooseMould,
@@ -301,6 +329,20 @@ export default {
   methods: {
     // region 一览界面操作
     /**
+     * @desc   : 给产品型号赋值
+     * @author : 周兴
+     * @date   : 2023/5/9 15:10
+     */
+    getPdtModel({rows, display}) {
+      if(rows && rows.length > 0){
+        this.formData.outputList = rows
+        this.formData.outputListName = display;
+      }else{
+        this.formData.outputList = []
+        this.formData.outputListName = null;
+      }
+    },
+    /**
      * @desc   : 切换当前行
      * @author : 洪旭东
      * @date   : 2023-02-15 11:42
@@ -538,6 +580,31 @@ export default {
       this.editAddModal = true
     },
     /**
+     * @desc   : 校验数据
+     * @author : 周兴
+     * @date   : 2023/5/9 16:58
+     */
+    validData() {
+      // 如果多个产出数量需要控制是否填上
+      if (this.formData.outputQty > 1) {
+        let table = this.$refs.pdtModelTable.getTableDataFilter();
+        // 判断工种对应的员工信息是否为空
+        for (let index = 0; index < table.length; index++) {
+          let it = table[index]
+          if (!it.pdtModelId || it.pdtModelId.length === 0) {
+            this.$Message.warning(this.$t('W_069', {
+              'param': this.$t('sequence') + (index + 1) + this.$t('rowNo') + this.$t('pdtModelName')
+            }))
+            this.setErrToRow(it, this.$t('W_093', {
+              'param': this.$t('pdtModelName')
+            }));// 给行增加错误提示信息
+            return false;
+          }
+        }
+      }
+      return true;
+    },
+    /**
      * @desc   : 给参数赋值
      * @author : 洪旭东
      * @date   : 2023-01-30 08:51
@@ -546,18 +613,48 @@ export default {
       if (this.$refs.editTableRange) {
         //装载区域
         this.formData.rangeList = this.$refs.editTableRange.getTableDataFilter();
-        this.formData.rangeList = this.formData.rangeList.filter(item=>item.rangeNo);
+        this.formData.rangeList = this.formData.rangeList.filter(item => item.rangeNo);
         //删除的装载区域
         this.formData.delRangeList = this.$refs.editTableRange.getDeleteData();
       }
       this.params = {...this.formData}
+      // 单个产出数量
       if (this.params.outputList) {
-        this.params.mouldOutputList = this.params.outputList.filter(f => f.pdtModelId).map(m => {return {
-          pdtModelId: m.pdtModelId,
-          repPdtModelIds: m.repPdtModelList ? m.repPdtModelList.map(mm => mm.repPdtModelId) : []
-        }})
+        this.params.mouldOutputList = []
+        // 设置后台保存需要的参数
+        let filters = this.params.outputList.filter(it => it.ownerFlag);// 主
+        if (filters && filters.length > 0) {
+          let item = {}
+          item.pdtModelId = filters[0].modelId;
+          item.repPdtModelIds = this.params.outputList.filter(it => !it.ownerFlag).map(mm => mm.modelId);
+          this.params.mouldOutputList.push(item);
+        }
+        // this.params.mouldOutputList = this.params.outputList.filter(f => f.pdtModelId).map(m => {
+        //   return {
+        //     pdtModelId: m.pdtModelId,
+        //     repPdtModelIds: m.repPdtModelList ? m.repPdtModelList.map(mm => mm.repPdtModelId) : []
+        //   }
+        // })
         delete this.params.outputList
       }
+      // 多个产出数量
+      if (this.params.outputQty > 1) {
+        this.params.mouldOutputList = []
+        let table = this.$refs.pdtModelTable.getTableDataFilter();
+        if (table && table.length > 0) {
+          let item = null
+          let filters = null
+          table.forEach(it => {
+            item = {}
+            filters = it.pdtModelId.filter(it => it.ownerFlag);// 主
+            if (filters && filters.length > 0) {
+              item.pdtModelId = filters[0].modelId;
+              item.repPdtModelIds = it.pdtModelId.filter(it => !it.ownerFlag).map(mm => mm.modelId);
+              this.params.mouldOutputList.push(item);
+            }
+          })
+        }
+      }
     },
     /**
      * @desc   : 保存方法
@@ -583,10 +680,50 @@ export default {
       this.defPdtModelId = null
       this.defPdtModelName = null
       this.formData.outputList = []
-      this.$refs.formInline.$refs['dk-form'].resetFields()
+      this.$refs.formInline.resetFields();
       this.modelMouldIndex = -1
     },
     /**
+     * @desc   : 设置产品型号的list
+     * @author : 周兴
+     * @date   : 2023/5/10 9:27
+     */
+    setMouldOutputList(outputList, moreFlag) {
+      let list = []
+      let finalList = []
+      if (outputList && outputList.length > 0) {
+        outputList.forEach(it => {
+          list = []
+          // 主
+          list.push({
+            modelId: it.pdtModelId,
+            modelName: it.pdtModelName,
+            ownerFlag: true,
+          })
+          // 从
+          if (it.repPdtModelIds && it.repPdtModelIds.length > 0) {
+            it.repPdtModelIds.forEach((t, index) => {
+              list.push({
+                modelId: t,
+                modelName: it.repPdtModelNames[index],
+                ownerFlag: false,
+              })
+            })
+          }
+          if (moreFlag) {
+            finalList.push({
+              pdtModelId: list
+            })
+          }
+        })
+      }
+      if (moreFlag) {
+        return finalList;
+      } else {
+        return list;
+      }
+    },
+    /**
      * @desc   : 通过id查询
      * @author : 洪旭东
      * @date   : 2023-01-30 08:51
@@ -600,18 +737,48 @@ export default {
           res.data.outputQtyOrigin = res.data.outputQty
           this.formData = res.data
           this.formData.rangeList = res.data.rangeList;
-          for (let it of res.data.mouldOutputList) {
-            it.repPdtModelList = []
-            for (let i = 0; i < it.repPdtModelIds.length; i++) {
-              it.repPdtModelList.push({
-                repPdtModelId: it.repPdtModelIds[i],
-                repPdtModelName: it.repPdtModelNames[i]
-              })
+          // 一个产品型号
+          if (this.formData.outputQty == 1 && res.data.mouldOutputList && res.data.mouldOutputList.length === 1) {
+            let item = res.data.mouldOutputList[0]
+            if (item.repPdtModelNames && item.repPdtModelNames.length > 0) {
+              this.formData.outputListName = item.pdtModelName + '【主】';
+              this.formData.outputListName = this.formData.outputListName + ',' + item.repPdtModelNames.toString();
+            }else{
+              this.formData.outputListName = item.pdtModelName ;
             }
-            delete it.repPdtModelIds
-            delete it.repPdtModelNames
+            // 生产集合数据
+            this.$set(this.formData, 'outputList', this.setMouldOutputList(res.data.mouldOutputList, false))
+          } else if (this.formData.outputQty > 1 && res.data.mouldOutputList && res.data.mouldOutputList.length > 1) {
+            // 多个产品
+            // 生产集合数据
+            this.moreOutputList = this.setMouldOutputList(res.data.mouldOutputList, true)
+            let value = ''
+            res.data.mouldOutputList.forEach((item, index) => {
+              if (item.repPdtModelNames && item.repPdtModelNames.length > 0) {
+                value = item.pdtModelName + '【主】';
+                value = value + ',' + item.repPdtModelNames.toString();
+              } else {
+                value = item.pdtModelName;
+              }
+              if (this.moreOutputList && this.moreOutputList[index]) {
+                this.moreOutputList[index].pdtModelId_Name = value;
+              }
+            })
+            console.log('222', this.formData, this.moreOutputList, res.data.mouldOutputList)
           }
-          this.formData.outputList = res.data.mouldOutputList
+
+          // for (let it of res.data.mouldOutputList) {
+          //   it.repPdtModelList = []
+          //   for (let i = 0; i < it.repPdtModelIds.length; i++) {
+          //     it.repPdtModelList.push({
+          //       repPdtModelId: it.repPdtModelIds[i],
+          //       repPdtModelName: it.repPdtModelNames[i]
+          //     })
+          //   }
+          //   delete it.repPdtModelIds
+          //   delete it.repPdtModelNames
+          // }
+          // this.formData.outputList = res.data.mouldOutputList
         }
 
       })
@@ -680,7 +847,7 @@ export default {
       } else if (this.modalParams.button !== this.$config.formMode.add && val < tableLength) {
         // 编辑，提示产出明细不可减少
         if (val < this.formData.outputQtyOrigin) {
-          this.$Message.error(this.$t('W_090'))
+          this.$Message.warning(this.$t('W_090'))
           this.formData.outputQty = this.formData.outputQtyOrigin
           for (let i = 0; i < tableLength - this.formData.outputQtyOrigin; i++) {
             this.$refs.pdtModelTable.del(tableLength - 1 - i)
@@ -691,14 +858,20 @@ export default {
           }
         }
       }
-
+      // 处理产品型号的数据
+      if(this.formData.outputQty == 1){
+        this.moreOutputList = []
+      }else if(this.formData.outputQty > 1){
+        this.formData.outputList = []
+        this.formData.outputListName = null
+      }
     },
     /**
      * @desc   : 标准次数失焦事件
      * @author : 洪旭东
      * @date   : 2023-03-16 09:46
      */
-    stdNumBlur (val) {
+    stdNumBlur(val) {
       if (!parseInt(val)) {
         this.formData.stdNum = 1
       }
@@ -708,7 +881,7 @@ export default {
      * @author : 洪旭东
      * @date   : 2023-04-10 13:45
      */
-    print(){
+    print() {
       this.$refs.printModal.showChooseTemplate = true
     },
     // endregion

src/view/mst/molding/form.vue

@@ -477,7 +477,7 @@ export default {
       if (this.$config.pdtGlueKind.fenZu == this.formData.pdtGlueKind && this.$refs.moldlineGroupTable.currentRowIndex!=0) {
         //本次新建模具与分组1中模具数量不一致不允许新建
         if (this.moldlineGroupList[0].moldlineItemList &&  this.moldlineItemList.length+1 > this.moldlineGroupList[0].moldlineItemList.length) {
-          this.$Message.error(this.$t('W_146'))
+          this.$Message.warning(this.$t('W_146'))
           return
         }
       }
@@ -486,7 +486,7 @@ export default {
       for (let i = val.outputQty; i > 0; i--) {
         //成型线位置序号的范围【1-999】，最多999个模具
         if (val.startItemNo + i - 1 < 1 || val.startItemNo + i - 1 > 999) {
-          this.$Message.error(this.$t('W_105'))
+          this.$Message.warning(this.$t('W_105'))
           return
         }
         //分组粘贴方式下 分组序号1中模具已有可变更产品型号，将数据赋值给其他分组序号下的模具
@@ -508,7 +508,7 @@ export default {
 
       //成型线位置序号的范围【1-999】，最多999个模具
       if (list.length > 999) {
-        this.$Message.error(this.$t('W_105'))
+        this.$Message.warning(this.$t('W_105'))
         return
       }
 
@@ -790,18 +790,18 @@ export default {
     validData() {
       // 成型线编码输入时要增加一个限制，不能输入【-】
       if (this.formData.uniqueCode && this.formData.uniqueCode.indexOf('-') > -1) {
-        this.$Message.error(this.$t('W_092'))
+        this.$Message.warning(this.$t('W_092'))
         return false;
       }
       // 分组中，分组序号和分组名称必填
       if (this.moldlineGroupList && this.moldlineGroupList.some(s => s.groupNo==null || !s.groupName)) {
-        this.$Message.error(this.$t('W_097'))
+        this.$Message.warning(this.$t('W_097'))
         return false;
       }
       //组内粘贴可变更产品名称不能为空
       if(this.$config.pdtGlueKind.zuNei === this.formData.pdtGlueKind){
         if (this.moldlineGroupList && this.moldlineGroupList.some(s => s.repPdtModelName==null || !s.repPdtModelName)) {
-          this.$Message.error(this.$t('W_145'))
+          this.$Message.warning(this.$t('W_145'))
           return false;
         }
       }
@@ -810,7 +810,7 @@ export default {
 
         //成型线上分组序号的范围【1-9】
         if (it.groupNo < 1 || it.groupNo > 9) {
-          this.$Message.error(this.$t('W_106'))
+          this.$Message.warning(this.$t('W_106'))
           return
         }
         if (it.moldlineItemList) {
@@ -819,7 +819,7 @@ export default {
 
         //检查位置序号是否重复
         if (noList.length != noList.unique().length) {
-          this.$Message.error(this.$t('W_094'))
+          this.$Message.warning(this.$t('W_094'))
           return
         }
       }
@@ -828,7 +828,7 @@ export default {
       if (this.$config.pdtGlueKind.fenZu == this.formData.pdtGlueKind) {
         //分组长度大于1
         if(this.moldlineGroupList.length<=1){
-          this.$Message.error(this.$t('W_149'))
+          this.$Message.warning(this.$t('W_149'))
           return false
         }
         //模具长度是否一致  可变更产品型号不可为空
@@ -836,12 +836,12 @@ export default {
         //分组粘贴下模具表格长度不一致
         itemListLength = this.moldlineGroupList.filter(fil=>fil.moldlineItemList).map(map=>map.moldlineItemList.length)
         if (itemListLength.filter(it=>it != this.moldlineGroupList[0].moldlineItemList.length).length>0) {
-          this.$Message.error(this.$t('W_146'))
+          this.$Message.warning(this.$t('W_146'))
           return false
         }
         for (let item of this.moldlineItemList) {
           if (this.moldlineItemList && this.moldlineItemList.some(s => s.repPdtModelName == null || !s.repPdtModelName)) {
-            this.$Message.error(this.$t('W_145'))
+            this.$Message.warning(this.$t('W_145'))
             return false
           }
         }

src/view/mst/mould-carryover/index.vue

@@ -213,7 +213,7 @@ export default {
               if (res.code === this.$config.SUCCESS_CODE) {
                 this.$Message.success(this.$t('I_001', {'param': this.$v('reverseCarryover')}))
               } else {
-                this.$Message.error(res.message)
+                this.$Message.warning(res.message)
               }
             })
           },
@@ -243,7 +243,7 @@ export default {
      */
     validData() {
       if(new Date(this.formData.dateEnd).getTime() >= new Date().getTime()){
-        this.$Message.error(this.$t('Q_014'))
+        this.$Message.warning(this.$t('Q_014'))
         return false;
       }
       return true;

src/view/mst/mould-check/form.vue

@@ -233,13 +233,13 @@
         let noList = []
         noList = noList.concat(this.detailList.copy().filter(f => f.userId).map(m => m.userId))
         if (noList.length != noList.unique().length) {
-          this.$Message.error(this.$t('W_121'))
+          this.$Message.warning(this.$t('W_121'))
           return false
         }
         //开始、结束时间，要有都有
         if((this.formData.makeTimeStart && !this.formData.makeTimeEnd) ||
           (!this.formData.makeTimeStart && this.formData.makeTimeEnd)){
-          this.$Message.error(this.$t('W_148'))
+          this.$Message.warning(this.$t('W_148'))
           return false
         }
         return true

src/view/mst/mould-check/index.vue

@@ -291,7 +291,7 @@
             this.formData.mouldCode = null
             this.getDetail(1)
           } else {
-            this.$Message.error(res.message)
+            this.$Message.warning(res.message)
           }
         })
       },
@@ -316,7 +316,7 @@
               }
             })
         } else {
-          this.$Message.error(this.$t('W_126'))
+          this.$Message.warning(this.$t('W_126'))
         }
       },
       /**

src/view/mst/mould-manager/index.vue

@@ -138,7 +138,7 @@ export default {
         // if(row && row.){
         // }
       } else {
-        this.$Message.error(this.$t('W_017'))
+        this.$Message.warning(this.$t('W_017'))
       }
     },
     /**
@@ -149,7 +149,7 @@ export default {
     uninstall() {
       let keys = this.$refs['table-select'].batchKeys
       if (keys.length === 0) {
-        this.$Message.error(this.$t('W_013'))
+        this.$Message.warning(this.$t('W_013'))
       } else {
         this.$IBMessage({
             content: this.$t('Q_002', {'param': this.$v('uninstall')}),

src/view/mst/mould/form.vue

@@ -466,7 +466,7 @@ export default {
       // 判断是否有工种信息
       if (!this.formData.modelMouldOutputList || this.formData.modelMouldOutputList.length === 0
         || (this.formData.modelMouldOutputList.length === 1 && !this.formData.modelMouldOutputList[0].pdtModelId)) {
-        this.$message.error(this.$t('W_061', {
+        this.$Message.warning(this.$t('W_061', {
           'param': this.$t('modelMouldOutput')
         }))
         return false;

src/view/mst/mould/index.vue

@@ -314,14 +314,14 @@ export default {
                 if (res.code === this.$config.SUCCESS_CODE) {
                   this.$Message.success(this.$t('I_001', {'param': this.$v('scrap')}))
                 } else {
-                  this.$Message.error(res.message)
+                  this.$Message.warning(res.message)
                 }
               })
             },
           }
         )
       } else {
-        this.$Message.error(this.$t('W_013'))
+        this.$Message.warning(this.$t('W_013'))
       }
     },
     /**
@@ -351,14 +351,14 @@ export default {
                 if (res.code === this.$config.SUCCESS_CODE) {
                   this.$Message.success(this.$t('I_001', {'param': this.$v('reverse')}))
                 } else {
-                  this.$Message.error(res.message)
+                  this.$Message.warning(res.message)
                 }
               })
             },
           }
         )
       } else {
-        this.$Message.error(this.$t('W_013'))
+        this.$Message.warning(this.$t('W_013'))
       }
     },
     /**
@@ -443,7 +443,7 @@ export default {
       // 判断是否变更信息
       if ((this.modalParams.button === this.$config.formMode.mouldChangeStdNum && this.originalStdNum === this.formData.stdNum)
         || (this.modalParams.button === this.$config.formMode.modelMouldChange && this.originalModelId === this.formData.modelId)) {
-        this.$message.error(this.$t('W_039'))
+        this.$Message.warning(this.$t('W_039'))
         return false;
       }
       return true;

src/view/mst/product-logo/index.vue

@@ -21,75 +21,75 @@
 
     <!--  查询条件区域  -->
     <div id="search-cond-div" ref="search-cond-div" style="margin-top: 1px;padding: 0">
-      <SearchCond ref="searchCond" v-model="searchCond"
-                  @collapse-change="collapseChange" :set-flag="false"
-                  :search-content="searchContent"></SearchCond>
+      <SearchCond ref="searchCond" v-model="searchCond" @collapse-change="collapseChange" :set-flag="false"
+        :search-content="searchContent"></SearchCond>
     </div>
-    <div>
-      <DkTable :id="'table-'+$options.name" ref="table-select" :data="tableData"
-               :pageFlag="true"
-               :page-total="pageInfo.total"
-               :current-page="pageInfo.currentPage"
-               :choose-flag="false"
-               :height="this.tableHeight" primaryKey="logoId"
-               @pageChange="pageSizeChange">
-<!--        <vxe-column width="80" class-name="img-column" :title="$t('productLogo')">-->
-<!--          <template #default="{row}">-->
-<!--            <img :src="row.logoPaths" style="width: 26px; height: 26px;"/>-->
-<!--          </template>-->
-<!--        </vxe-column>-->
-        <DkTableColumn field="logoPaths" type="image" width="80"></DkTableColumn>
-        <DkTableColumn field="logoCode" type="link" @on-link="handleLink(Object.assign($event,{button:'edit'}))"></DkTableColumn>
-        <DkTableColumn field="logoName" ></DkTableColumn>
-        <DkTableColumn field="brandName" ></DkTableColumn>
-        <DkTableColumn field="displayNo" ></DkTableColumn>
-        <DkTableColumn field="flgValid" type="switch" @on-switch-change="onSwitchChange"
-                       :switch-disabled="false" ></DkTableColumn>
-        <DkTableColumn field="remarks" width="auto"></DkTableColumn>
-      </DkTable>
+    <div :style="'height: ' + tableHeight + 'px'" class="split-div-class">
+      <DkSplit v-model="split">
+
+        <!-- 左边部分   -->
+        <DkTable slot="left" ref="leftTable" :data="leftData" :height="this.tableHeight" :page-flag="false"
+          :page-total-flag="false" :show-setting-flag="false" :freeze="false" :choose-flag="false"
+          @current-change="currentChangeEvent($event)">
+          <DkTableColumn :title="$t('brandCodeLogo')" field="brandName" width="auto" :filter="false" :sortable="false">
+          </DkTableColumn>
+        </DkTable>
+
+        <DkTable slot="right" :id="'table-' + $options.name" ref="table-select" :data="tableData" :pageFlag="true"
+          :page-total="pageInfo.total" :current-page="pageInfo.currentPage" :choose-flag="false"
+          :height="this.tableHeight" primaryKey="logoId" @pageChange="pageSizeChange">
+          <!--        <vxe-column width="80" class-name="img-column" :title="$t('productLogo')">-->
+          <!--          <template #default="{row}">-->
+          <!--            <img :src="row.logoPaths" style="width: 26px; height: 26px;"/>-->
+          <!--          </template>-->
+          <!--        </vxe-column>-->
+          <DkTableColumn field="logoPaths" type="image" width="80"></DkTableColumn>
+          <DkTableColumn field="logoCode" type="link" @on-link="handleLink(Object.assign($event, { button: 'edit' }))">
+          </DkTableColumn>
+          <DkTableColumn field="logoName"></DkTableColumn>
+          <DkTableColumn field="brandName"></DkTableColumn>
+          <DkTableColumn field="displayNo"></DkTableColumn>
+          <DkTableColumn field="flgValid" type="switch" @on-switch-change="onSwitchChange" :switch-disabled="false">
+          </DkTableColumn>
+          <DkTableColumn field="remarks" width="auto"></DkTableColumn>
+        </DkTable>
+      </DkSplit>
+
+
+
+
     </div>
     <!--新建编辑-->
-    <DkModal
-      :loading="loading"
-      v-model="editAddModal"
-      ref="modal_editAdd"
-      @on-visible-change="handleVisibleModal"
-      @modalOk="save"
-      :saveFlag="true"
-      :title=modalTitle
-    >
+    <DkModal :loading="loading" v-model="editAddModal" ref="modal_editAdd" @on-visible-change="handleVisibleModal"
+      @modalOk="save" :saveFlag="true" :title=modalTitle>
       <DkForm ref="formInline" v-model="formData" :col-count="1">
         <!--   商标代码     -->
-        <DkFormItem prop="logoCode"  :required="true">
-          <InputPop v-model="formData.logoCode" ref="logoCode"/>
+        <DkFormItem prop="logoCode" :required="true">
+          <InputPop v-model="formData.logoCode" ref="logoCode" />
         </DkFormItem>
         <!--    商标名称    -->
-        <DkFormItem prop="logoName"  :required="true">
-          <InputPop v-model="formData.logoName" ref="logoName"/>
+        <DkFormItem prop="logoName" :required="true">
+          <InputPop v-model="formData.logoName" ref="logoName" />
         </DkFormItem>
         <!--    产品品牌    -->
-        <DkFormItem prop="brandId"  :required="true"
-                    :data-type="this.$config.dataType.number">
-          <SelectPop v-model="formData.brandId" ref="brandId" :multiple="false"
-                     :options="brandList"
-                     labelKey="brandName"
-                     valueKey="brandId">
+        <DkFormItem prop="brandId" :required="true" :data-type="this.$config.dataType.number">
+          <SelectPop v-model="formData.brandId" ref="brandId" :multiple="false" :options="brandList" labelKey="brandName"
+            valueKey="brandId">
           </SelectPop>
 
         </DkFormItem>
         <!--    显示顺序    -->
-        <DkFormItem prop="displayNo"  :required="true" :data-type="this.$config.dataType.number">
-          <InputNumberPop v-model="formData.displayNo" ref="displayNo" :min="1" :digits="0"/>
+        <DkFormItem prop="displayNo" :required="true" :data-type="this.$config.dataType.number">
+          <InputNumberPop v-model="formData.displayNo" ref="displayNo" :min="1" :digits="0" />
         </DkFormItem>
         <!--    备注    -->
-        <DkFormItem prop="remarks" >
-          <InputPop v-model="formData.remarks" textareaFlag/>
+        <DkFormItem prop="remarks">
+          <InputPop v-model="formData.remarks" textareaFlag />
         </DkFormItem>
         <!--   商标上传     -->
-        <DkFormItem prop="logoPaths"  >
-          <DkPicWall ref="uploadFile" v-model="formData.logoPaths"
-                     folder="t_product_logo/logo_paths" :accept="this.$config.uploadFileConfig.acceptPicType"
-                     :format="['jpg','jpeg','png']"></DkPicWall>
+        <DkFormItem prop="logoPaths">
+          <DkPicWall ref="uploadFile" v-model="formData.logoPaths" folder="t_product_logo/logo_paths"
+            :accept="this.$config.uploadFileConfig.acceptPicType" :format="['jpg', 'jpeg', 'png']"></DkPicWall>
         </DkFormItem>
       </DkForm>
     </DkModal>
@@ -97,19 +97,21 @@
 </template>
 
 <script>
-import {indexMixin} from '@/mixins'
+import { indexMixin } from '@/mixins'
 
 export default {
   name: 'product-logo',
   mixins: [indexMixin],
   data() {
-    let  self =this
+    let self = this
     return {
+      leftData:[],
+      split: 0.2,// 分区的默认
       editAddModal: false,
       modalTitle: '',//新建编辑弹窗名称
       submitType: '',//新建编辑提交类型
       formData: {
-        logoPaths:[],
+        logoPaths: [],
         logoName: '',
         logoCode: '',
         brandId: null,
@@ -130,6 +132,26 @@ export default {
     }
   },
   methods: {
+
+
+    /**
+       * @desc   : 左侧列表行变化事件
+       * @author : 于继渤
+       * @date   : 2023/5/6 9:23
+       */
+    currentChangeEvent({ row }) {
+      if (row != null) {
+        this.brandId = row.brandId
+        // 导出额外的条件
+        this.exportCondition = { brandId: this.brandId }
+        let params = this.params
+        params.brandId = row.brandId
+        //查询型号类别列表的数据-右侧列表
+        this.searchData(params)
+      }
+    },
+
+
     // region 一览界面操作
     /**
      *   @desc   : switch停用启用
@@ -149,6 +171,7 @@ export default {
      *   @author : 洪旭东
      */
     getData(params) {
+      params.brandId = this.brandId
       // 查询数据
       return this.excute(this.$service.productLogoService, this.$service.productLogoService.selectByCond, params);
     },
@@ -163,7 +186,7 @@ export default {
     clear() {
       this.formData = {
         logoName: '',
-        logoPaths:[],
+        logoPaths: [],
         logoCode: '',
         brandId: '',
         ftyId: null,
@@ -179,7 +202,7 @@ export default {
      *   @author : 洪旭东
      */
     setParams() {
-      this.params = {...this.formData}
+      this.params = { ...this.formData }
     },
     /**
      *   @desc   : 保存数据
@@ -213,7 +236,7 @@ export default {
         // 加载最大序号
         this.getMaxDisplayNo(this.$config.displayNoTable.productLogo);
       }
-      if(type === this.$config.formMode.add || type === this.$config.formMode.edit ){
+      if (type === this.$config.formMode.add || type === this.$config.formMode.edit) {
         this.getBrandList();   // 加载产品品牌
       }
     },
@@ -222,17 +245,18 @@ export default {
      * @author : 夏常明
      * @date   : 2023/1/30 16:37
      */
-    getBrandList(){
+    getBrandList() {
       let params = {
         ftyId: this.$store.state.user.ftyId
       };
-      this.excute(this.$service.commonService, this.$service.commonService.getBrand,params, false).then(res => {//调用api查询方法
+      this.excute(this.$service.commonService, this.$service.commonService.getBrand, params, false).then(res => {//调用api查询方法
         if (res.code === this.$config.SUCCESS_CODE) {
           this.brandList = res.data
+          this.leftData = res.data
         }
       })
     },
-    getCurrentRow(){
+    getCurrentRow() {
 
     }
     ,
@@ -260,16 +284,18 @@ export default {
     detail(id) {
       this.excuteNoParam(this.$service.productLogoService, this.$service.productLogoService.selectById,
         [id], false).then(res => {//调用api查询方法
-        if (res.code === this.$config.SUCCESS_CODE) {
-          this.formData = res.data
-        }
-      })
+          if (res.code === this.$config.SUCCESS_CODE) {
+            this.formData = res.data
+          }
+        })
     },
     // endregion
   },
   created() {
     this.primaryKey = 'logoId'  // 设置主键Id
     this.routeObjName = 'productLogo'  // 设置路由名称
+    this.getBrandList();  
+  //  this.initSearchFlag = false;  // 初始不进行默认查询
   }
 }
 </script>
@@ -277,9 +303,9 @@ export default {
 <style scoped>
 /deep/ .img-column .vxe-cell {
   height: 30px !important;
-  display: flex  !important;
+  display: flex !important;
   justify-content: center !important;
-  align-items: center  !important;
+  align-items: center !important;
   cursor: pointer;
 }
 </style>

src/view/mst/product-view/form.vue

@@ -513,7 +513,7 @@
         //校验图片列表中图片名称重复
         fileNoList = fileNoList.concat(this.fileList.copy().filter(f => f.imageName).map(m => m.imageName))
         if (fileNoList.length != fileNoList.unique().length) {
-          this.$Message.error(this.$t('W_100'))
+          this.$Message.warning(this.$t('W_100'))
           return false
         }
         //校验图片列表中位置名称重复
@@ -522,7 +522,7 @@
             noList = noList.concat(it.productViewPlaceVOList.copy().filter(f => f.placeCode).map(m => m.placeCode))
           }
           if (noList.length != noList.unique().length) {
-            this.$Message.error(this.$t('W_102'))
+            this.$Message.warning(this.$t('W_102'))
             return false
           }
         }
@@ -540,7 +540,7 @@
             let it = item.productViewPlaceVOList[index]
             if (it.productPlaceId == null) {
               let rows = 1 + parseInt(index)
-              this.$message.error(this.$t('W_089', {
+              this.$Message.warning(this.$t('W_089', {
                 'param1': rows + this.$t('rowNo'),
                 'param2': this.$t('placeCode')
               }))
@@ -580,14 +580,14 @@
               if (validFlag) {
                 //判断是否存在图片
                 if (this.fileList.length == 0) {
-                  this.$message.error(this.$t('W_099'))
+                  this.$Message.warning(this.$t('W_099'))
                   return false
                 }
                 //判断一下最后一次操作的画布是否保存过
                 this.addBackGround(null, this.nowPicIndex, true)
                 for (let i of this.fileList) {
                   if (!i.productViewPlaceVOList) {
-                    this.$message.error(this.$t('W_098'))
+                    this.$Message.warning(this.$t('W_098'))
                     return false
                   }
                 }
@@ -619,11 +619,11 @@
                       this.close()
                     }
                   } else {
-                    this.$Message.error(result.message)
+                    this.$Message.warning(result.message)
                   }
                 })
               } else {
-                this.$message.error(this.$t('W_113'))
+                this.$Message.warning(this.$t('W_113'))
               }
             })
           }
@@ -739,7 +739,7 @@
           if (res.code === this.$config.SUCCESS_CODE) {
             this.placeList = res.data
           } else {
-            this.$Message.error(res.message)
+            this.$Message.warning(res.message)
           }
         })
       }

src/view/pdm/carrier-flow-pdt/index.vue

@@ -219,7 +219,7 @@
               }
             })
         } else {
-          this.$Message.error(this.$t('W_125'))
+          this.$Message.warning(this.$t('W_125'))
         }
       },
       /**

src/view/pdm/data-collection/climbKiln-add.vue

@@ -161,7 +161,7 @@
               //窑车位置
               this.getKilnCarPlace()
             } else {
-              this.$Message.error(res.message)
+              this.$Message.warning(res.message)
             }
           })
         }
@@ -222,7 +222,7 @@
               }
             } else {
               this.onProdUserCodeFlag = false
-              this.$Message.error(res.message)
+              this.$Message.warning(res.message)
             }
           })
         }else{
@@ -251,7 +251,7 @@
                   for (let it of tableList) {
                     //窑车窑炉存在相同位置
                     if ((this.formData.kilnCode + this.formData.KilnCarNumber + this.formData.carrierRangeId) == (it.carCode + it.carrierRangeId)) {
-                      this.$Message.error(this.$t('W_118'))
+                      this.$Message.warning(this.$t('W_118'))
                       return
                     }
                   }
@@ -269,7 +269,7 @@
                 this.$refs['table-select'].reloadData(this.tableData)
               }
             } else {
-              this.$Message.error(res.message)
+              this.$Message.warning(res.message)
             }
           })
         }
@@ -359,7 +359,7 @@
         this.excuteNoParam(this.$service.processNodeService, this.$service.processNodeService.selectById, [this.flowNodeId], false).then(res => {
           if (res.code === this.$config.SUCCESS_CODE) {
             if (res.data.userKind == null) {
-              this.$Message.error(this.$t('W_117'))
+              this.$Message.warning(this.$t('W_117'))
               return
             }
             this.userKind = res.data.userKind
@@ -377,7 +377,7 @@
               this.onProdUserCode()
             }
           } else {
-            this.$Message.error(res.message)
+            this.$Message.warning(res.message)
           }
         })
       },

src/view/pdm/data-collection/finishCheck-add.vue

@@ -366,7 +366,7 @@
               }
             } else {
               this.onProdUserCodeFlag = false
-              this.$Message.error(res.message)
+              this.$Message.warning(res.message)
             }
           })
         } else {
@@ -401,7 +401,7 @@
                 this.setBarCode(this.getBarCodeMessage)
               }
             } else {
-              this.$Message.error(res.message)
+              this.$Message.warning(res.message)
             }
           })
         }
@@ -431,7 +431,7 @@
                 //验证产品条码后赋值
                 this.setBarCode(this.getBarCodeMessage)
               } else {
-                this.$Message.error(res.message)
+                this.$Message.warning(res.message)
               }
             })
           }
@@ -502,7 +502,7 @@
               this.setBlameMessage(this.defectNodeList)
             }
           } else {
-            this.$Message.error(res.message)
+            this.$Message.warning(res.message)
           }
         })
       },
@@ -568,7 +568,7 @@
                 _this.staffList.filter(it => it.defaultFlag), true)
             }, 200)
           } else {
-            this.$Message.error(res.message)
+            this.$Message.warning(res.message)
           }
         })
       },
@@ -720,7 +720,7 @@
               //查询缺陷数据
               this.getDefect(rowIndex)
             } else {
-              this.$Message.error(res.message)
+              this.$Message.warning(res.message)
             }
           })
         } else if (field === 'blameNodeId') {
@@ -796,7 +796,7 @@
           for(let i of this.editDetailList){
             if(this.detailList.filter(it=>it.defectCode == i.defectCode &&
               it.pdtPlaceId ==i.pdtPlaceId && it.blameNodeId == i.pdtPlaceId).length>0){
-              this.$Message.error(this.$t('W_114'))
+              this.$Message.warning(this.$t('W_114'))
               return false
             }
           }
@@ -812,7 +812,7 @@
         let item = this.detailList[0]
         //region 缺陷编码
         if (item.defectCode == null) {
-          this.$Message.error(this.$t('W_069', { 'param': this.$t('placeCode') }))
+          this.$Message.warning(this.$t('W_069', { 'param': this.$t('placeCode') }))
           this.setErrToRow(item, this.$t('W_093', {
             'param': this.$t('defectCode')
           }))// 给行增加错误提示信息
@@ -823,7 +823,7 @@
 
         //region 缺陷位置
         if (item && this.formData.opnGradeKind != this.$config.gradeKindType.excellent && item.pdtPlaceId == null) {
-          this.$Message.error(this.$t('W_069', { 'param': this.$t('pdtPlaceId') }))
+          this.$Message.warning(this.$t('W_069', { 'param': this.$t('pdtPlaceId') }))
           this.setErrToRow(item, this.$t('W_093', {
             'param': this.$t('pdtPlaceId')
           }))// 给行增加错误提示信息
@@ -833,7 +833,7 @@
 
         //region 扣除数
         if (item.deductNum == null) {
-          this.$Message.error(this.$t('W_069', { 'param': this.$t('deductNum') }))
+          this.$Message.warning(this.$t('W_069', { 'param': this.$t('deductNum') }))
           this.setErrToRow(item, this.$t('W_093', {
             'param': this.$t('deductNum')
           }))// 给行增加错误提示信息
@@ -843,7 +843,7 @@
 
         //region 责任工序  todo  目前不是必填的
         // if (item.blameNodeId == null) {
-        //   this.$Message.error(this.$t('W_069', { 'param': this.$t('blameNodeId') }))
+        //   this.$Message.warning(this.$t('W_069', { 'param': this.$t('blameNodeId') }))
         //   this.setErrToRow(item, this.$t('W_093', {
         //     'param': this.$t('blameNodeId')
         //   }))// 给行增加错误提示信息
@@ -853,7 +853,7 @@
 
         //region 责任工号
         if (item.blameUserId == null) {
-          this.$Message.error(this.$t('W_069', { 'param': this.$t('blameUserId') }))
+          this.$Message.warning(this.$t('W_069', { 'param': this.$t('blameUserId') }))
           this.setErrToRow(item, this.$t('W_093', {
             'param': this.$t('blameUserId')
           }))// 给行增加错误提示信息
@@ -868,7 +868,7 @@
             let it = list[index]
             if (it.blameStaffId == null) {
               let rows = 1 + parseInt(index)
-              this.$Message.error(this.$t('W_089', {
+              this.$Message.warning(this.$t('W_089', {
                 'param1': rows + this.$t('rowNo'),
                 'param2': this.$t('blameStaffId')
               }))
@@ -879,7 +879,7 @@
             }
           }
         } else {
-          this.$Message.error(this.$t('W_122'))
+          this.$Message.warning(this.$t('W_122'))
           return false
         }
         //endregion
@@ -893,7 +893,7 @@
       addRow() {
         //添加行是否存在
         if (this.detailList.length == 0) {
-          this.$Message.error(this.$t('W_116'))
+          this.$Message.warning(this.$t('W_116'))
           return false
         }
         //判重校验
@@ -956,7 +956,7 @@
           if (res.code === this.$config.SUCCESS_CODE) {
             this.defectPlaceList = res.data
           } else {
-            this.$Message.error(res.message)
+            this.$Message.warning(res.message)
           }
         })
       },
@@ -1014,7 +1014,7 @@
       validData() {
         //判断是否有改判权限
         if (!this.gradeFlag) {
-          this.$Message.error(this.$t('W_131'))
+          this.$Message.warning(this.$t('W_131'))
           return false
         }
         //判断是否存在明细 并且 产品等级为瑕、劣
@@ -1022,18 +1022,18 @@
           (this.formData.opnGradeKind == this.$config.gradeKindType.flaw
             || this.formData.opnGradeKind == this.$config.gradeKindType.inferior)
         ) {
-          this.$Message.error(this.$t('W_115'))
+          this.$Message.warning(this.$t('W_115'))
           return false
         }
         //校验选择缺陷是否有数据
         if (this.editDetailList.length>0 && this.detailList && this.detailList.length == 1 && this.detailList[0].defectCode) {
-          this.$Message.error(this.$t('W_123'))
+          this.$Message.warning(this.$t('W_123'))
           return false
         }
         let noList = []
         noList = noList.concat(this.editDetailList.copy().filter(f => f.pdtDefectId).map(m => m.pdtDefectId + '-' + m.pdtPlaceId))
         if (noList.length != noList.unique().length) {
-          this.$Message.error(this.$t('W_114'))
+          this.$Message.warning(this.$t('W_114'))
           return false
         }
         return true
@@ -1126,7 +1126,7 @@
               }
             }
             if (res.data.userKind == null) {
-              this.$Message.error(this.$t('W_117'))
+              this.$Message.warning(this.$t('W_117'))
               return
             }
             this.userKind = res.data.userKind
@@ -1144,7 +1144,7 @@
               this.onProdUserCode()
             }
           } else {
-            this.$Message.error(res.message)
+            this.$Message.warning(res.message)
           }
         })
       },

src/view/pdm/data-collection/halfCheck-add.vue

@@ -366,7 +366,7 @@
               }
             } else {
               this.onProdUserCodeFlag = false
-              this.$Message.error(res.message)
+              this.$Message.warning(res.message)
             }
           })
         } else {
@@ -401,7 +401,7 @@
                 this.setBarCode(this.getBarCodeMessage)
               }
             } else {
-              this.$Message.error(res.message)
+              this.$Message.warning(res.message)
             }
           })
         }
@@ -431,7 +431,7 @@
                 //验证产品条码后赋值
                 this.setBarCode(this.getBarCodeMessage)
               } else {
-                this.$Message.error(res.message)
+                this.$Message.warning(res.message)
               }
             })
           }
@@ -502,7 +502,7 @@
               this.setBlameMessage(this.defectNodeList)
             }
           } else {
-            this.$Message.error(res.message)
+            this.$Message.warning(res.message)
           }
         })
       },
@@ -568,7 +568,7 @@
                 _this.staffList.filter(it => it.defaultFlag), true)
             }, 200)
           } else {
-            this.$Message.error(res.message)
+            this.$Message.warning(res.message)
           }
         })
       },
@@ -720,7 +720,7 @@
               //查询缺陷数据
               this.getDefect(rowIndex)
             } else {
-              this.$Message.error(res.message)
+              this.$Message.warning(res.message)
             }
           })
         } else if (field === 'blameNodeId') {
@@ -796,7 +796,7 @@
         if(this.editDetailList && this.editDetailList.length>0){
           for(let i of this.editDetailList){
             if(this.detailList.filter(it=>it.defectCode == i.defectCode && it.pdtPlaceId ==i.pdtPlaceId).length>0){
-              this.$Message.error(this.$t('W_114'))
+              this.$Message.warning(this.$t('W_114'))
               return false
             }
           }
@@ -812,7 +812,7 @@
         let item = this.detailList[0]
         //region 缺陷编码
         if (item.defectCode == null) {
-          this.$Message.error(this.$t('W_069', { 'param': this.$t('placeCode') }))
+          this.$Message.warning(this.$t('W_069', { 'param': this.$t('placeCode') }))
           this.setErrToRow(item, this.$t('W_093', {
             'param': this.$t('defectCode')
           }))// 给行增加错误提示信息
@@ -823,7 +823,7 @@
 
         //region 缺陷位置
         if (item && this.formData.opnGradeKind != this.$config.gradeKindType.excellent && item.pdtPlaceId == null) {
-          this.$Message.error(this.$t('W_069', { 'param': this.$t('pdtPlaceId') }))
+          this.$Message.warning(this.$t('W_069', { 'param': this.$t('pdtPlaceId') }))
           this.setErrToRow(item, this.$t('W_093', {
             'param': this.$t('pdtPlaceId')
           }))// 给行增加错误提示信息
@@ -833,7 +833,7 @@
 
         //region 扣除数
         if (item.deductNum == null) {
-          this.$Message.error(this.$t('W_069', { 'param': this.$t('deductNum') }))
+          this.$Message.warning(this.$t('W_069', { 'param': this.$t('deductNum') }))
           this.setErrToRow(item, this.$t('W_093', {
             'param': this.$t('deductNum')
           }))// 给行增加错误提示信息
@@ -843,7 +843,7 @@
 
         //region 责任工序  todo  目前不是必填的
         // if (item.blameNodeId == null) {
-        //   this.$Message.error(this.$t('W_069', { 'param': this.$t('blameNodeId') }))
+        //   this.$Message.warning(this.$t('W_069', { 'param': this.$t('blameNodeId') }))
         //   this.setErrToRow(item, this.$t('W_093', {
         //     'param': this.$t('blameNodeId')
         //   }))// 给行增加错误提示信息
@@ -853,7 +853,7 @@
 
         //region 责任工号
         if (item.blameUserId == null) {
-          this.$Message.error(this.$t('W_069', { 'param': this.$t('blameUserId') }))
+          this.$Message.warning(this.$t('W_069', { 'param': this.$t('blameUserId') }))
           this.setErrToRow(item, this.$t('W_093', {
             'param': this.$t('blameUserId')
           }))// 给行增加错误提示信息
@@ -868,7 +868,7 @@
             let it = list[index]
             if (it.blameStaffId == null) {
               let rows = 1 + parseInt(index)
-              this.$Message.error(this.$t('W_089', {
+              this.$Message.warning(this.$t('W_089', {
                 'param1': rows + this.$t('rowNo'),
                 'param2': this.$t('blameStaffId')
               }))
@@ -879,7 +879,7 @@
             }
           }
         } else {
-          this.$Message.error(this.$t('W_122'))
+          this.$Message.warning(this.$t('W_122'))
           return false
         }
         //endregion
@@ -893,7 +893,7 @@
       addRow() {
         //添加行是否存在
         if (this.detailList.length == 0) {
-          this.$Message.error(this.$t('W_116'))
+          this.$Message.warning(this.$t('W_116'))
           return false
         }
         //判重校验
@@ -956,7 +956,7 @@
           if (res.code === this.$config.SUCCESS_CODE) {
             this.defectPlaceList = res.data
           } else {
-            this.$Message.error(res.message)
+            this.$Message.warning(res.message)
           }
         })
       },
@@ -1014,25 +1014,25 @@
       validData() {
         //判断是否有改判权限
         if (!this.gradeFlag) {
-          this.$Message.error(this.$t('W_131'))
+          this.$Message.warning(this.$t('W_131'))
           return false
         }
         //判断是否存在明细 并且 产品等级为瑕、劣
         if(this.editDetailList.length == 0 &&
           (this.formData.opnGradeKind == this.$config.gradeKindType.flaw ||
           this.formData.opnGradeKind == this.$config.gradeKindType.inferior)) {
-          this.$Message.error(this.$t('W_115'))
+          this.$Message.warning(this.$t('W_115'))
           return false
         }
         //校验选择缺陷是否有数据
         if (this.editDetailList.length>0 && this.detailList && this.detailList.length ==1 && this.detailList[0].defectCode) {
-          this.$Message.error(this.$t('W_123'))
+          this.$Message.warning(this.$t('W_123'))
           return false
         }
         let noList = []
         noList = noList.concat(this.editDetailList.copy().filter(f => f.pdtDefectId).map(m => m.pdtDefectId + '-' + m.pdtPlaceId))
         if (noList.length != noList.unique().length) {
-          this.$Message.error(this.$t('W_114'))
+          this.$Message.warning(this.$t('W_114'))
           return false
         }
         return true
@@ -1125,7 +1125,7 @@
               }
             }
             if (res.data.userKind == null) {
-              this.$Message.error(this.$t('W_117'))
+              this.$Message.warning(this.$t('W_117'))
               return
             }
             this.userKind = res.data.userKind
@@ -1143,7 +1143,7 @@
               this.onProdUserCode()
             }
           } else {
-            this.$Message.error(res.message)
+            this.$Message.warning(res.message)
           }
         })
       },

src/view/pdm/data-collection/halfCheck-touch-add.vue

@@ -383,7 +383,7 @@
               }
             } else {
               this.onProdUserCodeFlag = false
-              this.$Message.error(res.message)
+              this.$Message.warning(res.message)
             }
           })
         } else {
@@ -419,7 +419,7 @@
                 this.setBarCode(this.getBarCodeMessage)
               }
             } else {
-              this.$Message.error(res.message)
+              this.$Message.warning(res.message)
             }
           })
         }
@@ -449,7 +449,7 @@
                 //验证产品条码后赋值
                 this.setBarCode(this.getBarCodeMessage)
               } else {
-                this.$Message.error(res.message)
+                this.$Message.warning(res.message)
               }
             })
           }
@@ -520,7 +520,7 @@
               this.setBlameMessage(this.defectNodeList)
             }
           } else {
-            this.$Message.error(res.message)
+            this.$Message.warning(res.message)
           }
         })
       },
@@ -586,7 +586,7 @@
                 _this.staffList.filter(it => it.defaultFlag), true)
             }, 200)
           } else {
-            this.$Message.error(res.message)
+            this.$Message.warning(res.message)
           }
         })
       },
@@ -738,7 +738,7 @@
               //查询缺陷数据
               this.getDefect(rowIndex)
             } else {
-              this.$Message.error(res.message)
+              this.$Message.warning(res.message)
             }
           })
         } else if (field === 'blameNodeId') {
@@ -812,7 +812,7 @@
         let item = this.detailList[0]
         //region 缺陷编码
         if (item.defectCode == null) {
-          this.$Message.error(this.$t('W_069', { 'param': this.$t('placeCode') }))
+          this.$Message.warning(this.$t('W_069', { 'param': this.$t('placeCode') }))
           this.setErrToRow(item, this.$t('W_093', {
             'param': this.$t('defectCode')
           }))// 给行增加错误提示信息
@@ -823,7 +823,7 @@
 
         //region 缺陷位置
         if (item && this.formData.opnGradeKind != this.$config.gradeKindType.excellent && item.pdtPlaceId == null) {
-          this.$Message.error(this.$t('W_069', { 'param': this.$t('pdtPlaceId') }))
+          this.$Message.warning(this.$t('W_069', { 'param': this.$t('pdtPlaceId') }))
           this.setErrToRow(item, this.$t('W_093', {
             'param': this.$t('pdtPlaceId')
           }))// 给行增加错误提示信息
@@ -833,7 +833,7 @@
 
         //region 扣除数
         if (item.deductNum == null) {
-          this.$Message.error(this.$t('W_069', { 'param': this.$t('deductNum') }))
+          this.$Message.warning(this.$t('W_069', { 'param': this.$t('deductNum') }))
           this.setErrToRow(item, this.$t('W_093', {
             'param': this.$t('deductNum')
           }))// 给行增加错误提示信息
@@ -843,7 +843,7 @@
 
         //region 责任工序  todo  目前不是必填的
         // if (item.blameNodeId == null) {
-        //   this.$Message.error(this.$t('W_069', { 'param': this.$t('blameNodeId') }))
+        //   this.$Message.warning(this.$t('W_069', { 'param': this.$t('blameNodeId') }))
         //   this.setErrToRow(item, this.$t('W_093', {
         //     'param': this.$t('blameNodeId')
         //   }))// 给行增加错误提示信息
@@ -853,7 +853,7 @@
 
         //region 责任工号
         if (item.blameUserId == null) {
-          this.$Message.error(this.$t('W_069', { 'param': this.$t('blameUserId') }))
+          this.$Message.warning(this.$t('W_069', { 'param': this.$t('blameUserId') }))
           this.setErrToRow(item, this.$t('W_093', {
             'param': this.$t('blameUserId')
           }))// 给行增加错误提示信息
@@ -868,7 +868,7 @@
             let it = list[index]
             if (it.blameStaffId == null) {
               let rows = 1 + parseInt(index)
-              this.$Message.error(this.$t('W_089', {
+              this.$Message.warning(this.$t('W_089', {
                 'param1': rows + this.$t('rowNo'),
                 'param2': this.$t('blameStaffId')
               }))
@@ -879,7 +879,7 @@
             }
           }
         } else {
-          this.$Message.error(this.$t('W_122'))
+          this.$Message.warning(this.$t('W_122'))
           return false
         }
         //endregion
@@ -893,7 +893,7 @@
       addRow() {
         //添加行是否存在
         if (this.detailList.length == 0) {
-          this.$Message.error(this.$t('W_116'))
+          this.$Message.warning(this.$t('W_116'))
           return false
         }
         //校验添加行数据
@@ -953,7 +953,7 @@
           if (res.code === this.$config.SUCCESS_CODE) {
             this.defectPlaceList = res.data
           } else {
-            this.$Message.error(res.message)
+            this.$Message.warning(res.message)
           }
         })
       },
@@ -1007,7 +1007,7 @@
       validData() {
         //判断是否有改判权限
         if (!this.gradeFlag) {
-          this.$Message.error(this.$t('W_131'))
+          this.$Message.warning(this.$t('W_131'))
           return false
         }
         //判断是否存在明细 并且 产品等级为瑕、劣
@@ -1015,18 +1015,18 @@
           (this.formData.opnGradeKind == this.$config.gradeKindType.flaw
             || this.formData.opnGradeKind == this.$config.gradeKindType.inferior)
         ) {
-          this.$Message.error(this.$t('W_115'))
+          this.$Message.warning(this.$t('W_115'))
           return false
         }
         //校验选择缺陷是否有数据
         if (this.detailList && this.detailList.length == 1 && this.detailList[0].defectCode) {
-          this.$Message.error(this.$t('W_123'))
+          this.$Message.warning(this.$t('W_123'))
           return false
         }
         let noList = []
         noList = noList.concat(this.editDetailList.copy().filter(f => f.pdtDefectId).map(m => m.pdtDefectId + '-' + m.pdtPlaceId))
         if (noList.length != noList.unique().length) {
-          this.$Message.error(this.$t('W_114'))
+          this.$Message.warning(this.$t('W_114'))
           return false
         }
         return true
@@ -1119,7 +1119,7 @@
               }
             }
             if (res.data.userKind == null) {
-              this.$Message.error(this.$t('W_117'))
+              this.$Message.warning(this.$t('W_117'))
               return
             }
             this.userKind = res.data.userKind
@@ -1137,7 +1137,7 @@
               this.onProdUserCode()
             }
           } else {
-            this.$Message.error(res.message)
+            this.$Message.warning(res.message)
           }
         })
       },

src/view/pdm/data-collection/inKiln-add.vue

@@ -176,7 +176,7 @@
                 this.save()
               }
             } else {
-              this.$Message.error(res.message)
+              this.$Message.warning(res.message)
             }
           })
         }
@@ -211,7 +211,7 @@
                 }
               }
             } else {
-              this.$Message.error(res.message)
+              this.$Message.warning(res.message)
             }
           })
         }
@@ -272,7 +272,7 @@
               }
             } else {
               this.onProdUserCodeFlag = false
-              this.$Message.error(res.message)
+              this.$Message.warning(res.message)
             }
           })
         }else{
@@ -350,7 +350,7 @@
             this.pieceKind = res.data.pieceKind
             this.opnKind = res.data.opnKind
             if (res.data.userKind == null) {
-              this.$Message.error(this.$t('W_117'))
+              this.$Message.warning(this.$t('W_117'))
               return
             }
             this.userKind = res.data.userKind
@@ -368,7 +368,7 @@
               this.onProdUserCode()
             }
           } else {
-            this.$Message.error(res.message)
+            this.$Message.warning(res.message)
           }
         })
       },

src/view/pdm/data-collection/outKiln-add.vue

@@ -176,7 +176,7 @@
                 this.save()
               }
             } else {
-              this.$Message.error(res.message)
+              this.$Message.warning(res.message)
             }
           })
         }
@@ -211,7 +211,7 @@
                 }
               }
             } else {
-              this.$Message.error(res.message)
+              this.$Message.warning(res.message)
             }
           })
         }
@@ -272,7 +272,7 @@
               }
             } else {
               this.onProdUserCodeFlag = false
-              this.$Message.error(res.message)
+              this.$Message.warning(res.message)
             }
           })
         }else{
@@ -350,7 +350,7 @@
             this.pieceKind = res.data.pieceKind
             this.opnKind = res.data.opnKind
             if (res.data.userKind == null) {
-              this.$Message.error(this.$t('W_117'))
+              this.$Message.warning(this.$t('W_117'))
               return
             }
             this.userKind = res.data.userKind
@@ -368,7 +368,7 @@
               this.onProdUserCode()
             }
           } else {
-            this.$Message.error(res.message)
+            this.$Message.warning(res.message)
           }
         })
       },

src/view/pdm/data-collection/recover-add.vue

@@ -168,7 +168,7 @@
               }
             } else {
               this.onProdUserCodeFlag = false
-              this.$Message.error(res.message)
+              this.$Message.warning(res.message)
             }
           })
         }else{
@@ -202,7 +202,7 @@
                 }
               }
             } else {
-              this.$Message.error(res.message)
+              this.$Message.warning(res.message)
             }
           })
         }
@@ -274,7 +274,7 @@
           if (res.code === this.$config.SUCCESS_CODE) {
             this.pieceKind = res.data.pieceKind
             if (res.data.userKind == null) {
-              this.$Message.error(this.$t('W_117'))
+              this.$Message.warning(this.$t('W_117'))
               return
             }
             this.userKind = res.data.userKind
@@ -292,7 +292,7 @@
               this.onProdUserCode()
             }
           } else {
-            this.$Message.error(res.message)
+            this.$Message.warning(res.message)
           }
         })
       },

src/view/pdm/data-collection/register-add.vue

@@ -233,11 +233,11 @@
             //此工序有配置工位，工位不能为空
             else if (res.code !== this.$config.SUCCESS_CODE &&
               this.$config.processTypeException.CHKCAR009 == res.exception) {
-              this.$Message.error(res.message)
+              this.$Message.warning(res.message)
               this.punchTheClock=true
             }
             else {
-              this.$Message.error(res.message)
+              this.$Message.warning(res.message)
             }
           })
         }else{
@@ -269,7 +269,7 @@
                 this.setBarCode(this.getBarCodeMessage)
               }
             } else {
-              this.$Message.error(res.message)
+              this.$Message.warning(res.message)
             }
           })
         }
@@ -326,7 +326,7 @@
                 //验证产品条码后赋值
                 this.setBarCode(this.getBarCodeMessage)
               } else {
-                this.$Message.error(res.message)
+                this.$Message.warning(res.message)
               }
             })
           }
@@ -382,7 +382,7 @@
               this.formData.carCode) {
             } else {
               this.formData.carCode = null
-              this.$Message.error(res.message)
+              this.$Message.warning(res.message)
             }
           })
         }
@@ -466,7 +466,7 @@
             this.pieceKind = res.data.pieceKind
             this.opnKind = res.data.opnKind
             if (res.data.userKind == null) {
-              this.$Message.error(this.$t('W_117'))
+              this.$Message.warning(this.$t('W_117'))
               return
             }
             this.userKind = res.data.userKind
@@ -484,7 +484,7 @@
               this.onProdUserCode()
             }
           } else {
-            this.$Message.error(res.message)
+            this.$Message.warning(res.message)
           }
         })
       },

src/view/pdm/data-collection/uninstallKiln-add.vue

@@ -158,7 +158,7 @@
                 }
               }
             } else {
-              this.$Message.error(res.message)
+              this.$Message.warning(res.message)
             }
           })
         }
@@ -219,7 +219,7 @@
               }
             } else {
               this.onProdUserCodeFlag = false
-              this.$Message.error(res.message)
+              this.$Message.warning(res.message)
             }
           })
         }else{
@@ -295,7 +295,7 @@
         this.excuteNoParam(this.$service.processNodeService, this.$service.processNodeService.selectById, [this.flowNodeId], false).then(res => {
           if (res.code === this.$config.SUCCESS_CODE) {
             if (res.data.userKind == null) {
-              this.$Message.error(this.$t('W_117'))
+              this.$Message.warning(this.$t('W_117'))
               return
             }
             this.userKind = res.data.userKind
@@ -313,7 +313,7 @@
               this.onProdUserCode()
             }
           } else {
-            this.$Message.error(res.message)
+            this.$Message.warning(res.message)
           }
         })
       },

src/view/pdm/molding-record/bind-barcode-group.vue

@@ -161,11 +161,11 @@
        */
       bindBarcodeButton() {
         if (!this.formData.produceBarCode) {
-          this.$Message.error(this.$t('W_109'))
+          this.$Message.warning(this.$t('W_109'))
           return
         }
         if (!this.checkProduceBarCode(this.formData.produceBarCode)) {
-          this.$Message.error(this.$t('W_104'))
+          this.$Message.warning(this.$t('W_104'))
           return
         }
         let reg = /(\d+)/g
@@ -296,7 +296,7 @@
           }
         }
         if (pdtUniqueIdList.length == 0) {
-          this.$Message.error(this.$t('W_150'))
+          this.$Message.warning(this.$t('W_150'))
           return
         }
         this.excute(this.$service.productService, this.$service.productService.undo, pdtUniqueIdList).then(res => {
@@ -304,7 +304,7 @@
             this.$Message.success(res.message)
             this.detail(this.$route.params.id)
           } else {
-            this.$Message.error(res.message)
+            this.$Message.warning(res.message)
           }
         })
       },
@@ -488,7 +488,7 @@
             this.$Message.success(res.message)
             this.detail(this.$route.params.id)
           } else {
-            this.$Message.error(res.message)
+            this.$Message.warning(res.message)
           }
         })
         return excute
@@ -503,7 +503,7 @@
         //校验绑定条码
         codeNoList = codeNoList.concat(this.moldingRecordList.copy().filter(f => f.productUniqueCode).map(m => m.productUniqueCode))
         if (codeNoList.length != codeNoList.unique().length) {
-          this.$Message.error(this.$t('W_110'))
+          this.$Message.warning(this.$t('W_110'))
           return false
         }
         return true

src/view/pdm/molding-record/bind-barcode-grouping.vue

@@ -168,11 +168,11 @@
        */
       bindBarcodeButton() {
         if (!this.formData.produceBarCode) {
-          this.$Message.error(this.$t('W_109'))
+          this.$Message.warning(this.$t('W_109'))
           return
         }
         if (!this.checkProduceBarCode(this.formData.produceBarCode)) {
-          this.$Message.error(this.$t('W_104'))
+          this.$Message.warning(this.$t('W_104'))
           return
         }
         let reg = /(\d+)/g
@@ -303,7 +303,7 @@
           }
         }
         if (pdtUniqueIdList.length == 0) {
-          this.$Message.error(this.$t('W_150'))
+          this.$Message.warning(this.$t('W_150'))
           return
         }
         this.excute(this.$service.productService, this.$service.productService.undo, pdtUniqueIdList).then(res => {
@@ -311,7 +311,7 @@
             this.$Message.success(res.message)
             this.detail(this.$route.params.id)
           } else {
-            this.$Message.error(res.message)
+            this.$Message.warning(res.message)
           }
         })
       },
@@ -405,10 +405,10 @@
             //加载数据
             this.$refs.moldingRecord.getDataTable(this.row)
           } else {
-            this.$Message.error(this.$t('W_143'))
+            this.$Message.warning(this.$t('W_143'))
           }
         } else {
-          this.$Message.error(this.$t('W_142'))
+          this.$Message.warning(this.$t('W_142'))
         }
       },
       /**
@@ -551,7 +551,7 @@
             this.$Message.success(res.message)
             this.detail(this.$route.params.id)
           } else {
-            this.$Message.error(res.message)
+            this.$Message.warning(res.message)
           }
         })
         return excute
@@ -566,7 +566,7 @@
         //校验绑定条码
         codeNoList = codeNoList.concat(this.moldingRecordList.copy().filter(f => f.productUniqueCode).map(m => m.productUniqueCode))
         if (codeNoList.length != codeNoList.unique().length) {
-          this.$Message.error(this.$t('W_110'))
+          this.$Message.warning(this.$t('W_110'))
           return false
         }
         //todo  判断每组数据是否达到可保存数量
@@ -575,7 +575,7 @@
           //过滤掉总单中本次不需要进行绑定条码的数据
           for (let i of  this.moldingRecordList.filter(it => !it.readOnlyUniqueCode)) {
             if (!i.modelCount || i.modelCount && i.modelCount != i.bomItems.length) {
-              this.$Message.error(this.$t('W_144'))
+              this.$Message.warning(this.$t('W_144'))
               return false
             }
           }

src/view/pdm/molding-record/bind-barcode.vue

@@ -139,11 +139,11 @@
        */
       bindBarcodeButton() {
         if (!this.formData.produceBarCode) {
-          this.$Message.error(this.$t('W_109'))
+          this.$Message.warning(this.$t('W_109'))
           return
         }
         if (!this.checkProduceBarCode(this.formData.produceBarCode)) {
-          this.$Message.error(this.$t('W_104'))
+          this.$Message.warning(this.$t('W_104'))
           return
         }
         let reg = /(\d+)/g
@@ -245,7 +245,7 @@
       revokeBindBarcode() {
         let pdtUniqueIdList = this.$refs['moldingRecord'].$refs.xTable.getCheckboxRecords().map(map => map.pdtUniqueId)
         if (pdtUniqueIdList.length == 0) {
-          this.$Message.error(this.$t('W_150'))
+          this.$Message.warning(this.$t('W_150'))
           return
         }
         this.excute(this.$service.productService, this.$service.productService.undo, pdtUniqueIdList).then(res => {
@@ -253,7 +253,7 @@
             this.$Message.success(res.message)
             this.detail(this.$route.params.id)
           } else {
-            this.$Message.error(res.message)
+            this.$Message.warning(res.message)
           }
         })
       },
@@ -340,7 +340,7 @@
             this.$Message.success(res.message)
             this.detail(this.$route.params.id)
           } else {
-            this.$Message.error(res.message)
+            this.$Message.warning(res.message)
           }
         })
         return excute
@@ -355,7 +355,7 @@
         //校验图片列表中图片名称重复
         codeNoList = codeNoList.concat(this.moldingRecordList.copy().filter(f => f.productUniqueCode).map(m => m.productUniqueCode))
         if (codeNoList.length != codeNoList.unique().length) {
-          this.$Message.error(this.$t('W_110'))
+          this.$Message.warning(this.$t('W_110'))
           return false
         }
         return true

src/view/pdm/molding-record/damage.vue

@@ -246,7 +246,7 @@ export default {
         if (res.code === this.$config.SUCCESS_CODE) {
           this.moldlineList = res.data;
         } else {
-          this.$Message.error(res.message)
+          this.$Message.warning(res.message)
           this.moldlineList = null
         }
       })
@@ -316,13 +316,13 @@ export default {
     validData() {
       let changeTable = this.$refs.moldingRecord.getTableChangeData();
       if (!changeTable || changeTable.length === 0){
-        this.$message.error(this.$t('W_015'))
+        this.$Message.warning(this.$t('W_015'))
         return false;
       }
 
       let table = this.$refs.moldingRecord.getTableData();
       if (!table || table.length === 0) {
-        this.$message.error(this.$t('W_012'))
+        this.$Message.warning(this.$t('W_012'))
         return false;
       }
       // 判断是否勾选开模损的，是否都有开模损原因
@@ -337,7 +337,7 @@ export default {
         }
       }
       if (flag) {
-        this.$message.error(this.$t('W_093', {
+        this.$Message.warning(this.$t('W_093', {
           'param': this.$t('scrapReasonId')
         }))
         return false;

src/view/pdm/molding-record/form.vue

@@ -469,7 +469,7 @@ export default {
         }
       }
       if (!param.lastMoldingDate) {
-        this.$message.error(this.$t('W_093', {
+        this.$Message.warning(this.$t('W_093', {
           'param': this.$t('moldingDate')
         }))
         return
@@ -493,7 +493,7 @@ export default {
           this.moldlineList = table
 
         } else {
-          this.$Message.error(res.message)
+          this.$Message.warning(res.message)
           this.moldlineList = []
         }
       })
@@ -524,7 +524,7 @@ export default {
       let batchRows = this.$refs['moldlineTable'].batchRows
       // 判断信息是否为空
       if (!batchRows || batchRows.length === 0) {
-        this.$message.error(this.$t('W_012'))
+        this.$Message.warning(this.$t('W_012'))
         return false
       }
       let batchKeys = this.$refs['moldlineTable'].batchKeys
@@ -535,7 +535,7 @@ export default {
         }
         let rows = 1 + parseInt(index)
         if (index >= 0 && it.userBindKind == this.$config.userBindKind.fenZu && !it.moldingUserId) {
-          this.$message.error(this.$t('W_089', {
+          this.$Message.warning(this.$t('W_089', {
             'param1': rows + this.$t('rowNo'),
             'param2': this.$t('moldingUserId')
           }))
@@ -545,7 +545,7 @@ export default {
           return false
         }
         if (index >= 0 && !it.moldingCount || it.moldingCount === 0) {
-          this.$message.error(this.$t('W_089', {
+          this.$Message.warning(this.$t('W_089', {
             'param1': rows + this.$t('rowNo'),
             'param2': this.$t('moldingCount')
           }))
@@ -556,7 +556,7 @@ export default {
         }
         // 成型次数输入范围1-10
         if (index >= 0 && it.moldingCount > 10) {
-          this.$message.error(this.$t('W_051', {
+          this.$Message.warning(this.$t('W_051', {
             'param1': this.$t('sequence') + rows + this.$t('rowNo') + this.$t('moldingCount'),
             'param2': 10
           }))
@@ -564,7 +564,7 @@ export default {
         }
         // 多批次标识为false的成型次数只能为1
         if (index >= 0 && !it.flgCanBatches && it.moldingCount > 1) {
-          this.$message.error(this.$t('W_051', {
+          this.$Message.warning(this.$t('W_051', {
             'param1': this.$t('sequence') + rows + this.$t('rowNo') + this.$t('moldingCount'),
             'param2': 1
           }))
@@ -895,7 +895,7 @@ export default {
     validData() {
       // 判断是否有成型记录信息
       if (!this.moldingRecordList || this.moldingRecordList.length === 0) {
-        this.$message.error(this.$t('W_061', {
+        this.$Message.warning(this.$t('W_061', {
           'param': this.$t('moldingRecord')
         }))
         return false
@@ -905,7 +905,7 @@ export default {
         //成型工号
         if (index >= 0 && !it.moldingUser) {
           let rows = 1 + parseInt(index)
-          this.$message.error(this.$t('W_089', {
+          this.$Message.warning(this.$t('W_089', {
             'param1': rows + this.$t('rowNo'),
             'param2': this.$t('moldingUserId')
           }))
@@ -917,7 +917,7 @@ export default {
         //产品商标
         if (index >= 0 && !it.pdtLogoId) {
           let rows = 1 + parseInt(index)
-          this.$message.error(this.$t('W_089', {
+          this.$Message.warning(this.$t('W_089', {
             'param1': rows + this.$t('rowNo'),
             'param2': this.$t('pdtLogoId')
           }))
@@ -929,7 +929,7 @@ export default {
         //产品釉色
         if (index >= 0 && !it.pdtColourId) {
           let rows = 1 + parseInt(index)
-          this.$message.error(this.$t('W_089', {
+          this.$Message.warning(this.$t('W_089', {
             'param1': rows + this.$t('rowNo'),
             'param2': this.$t('pdtColourId')
           }))
@@ -941,7 +941,7 @@ export default {
         //成型标识
         if (index >= 0 && !it.flgMolding && !it.unmoldedReasonId) {
           let rows = 1 + parseInt(index)
-          this.$message.error(this.$t('W_089', {
+          this.$Message.warning(this.$t('W_089', {
             'param1': rows + this.$t('rowNo'),
             'param2': this.$t('unmoldedReasonId')
           }))
@@ -953,7 +953,7 @@ export default {
         //开磨损原因
         if (index >= 0 && !it.scrapReasonId && it.flgScrap) {
           let rows = 1 + parseInt(index)
-          this.$message.error(this.$t('W_089', {
+          this.$Message.warning(this.$t('W_089', {
             'param1': rows + this.$t('rowNo'),
             'param2': this.$t('scrapReasonId')
           }))

src/view/pdm/molding-record/index.vue

@@ -233,7 +233,7 @@ export default {
             }
           })
         }else{
-          this.$Message.error(this.$t('W_140'))
+          this.$Message.warning(this.$t('W_140'))
         }
       }
     },

src/view/pdm/molding-user-change/index.vue

@@ -146,13 +146,6 @@ export default {
      */
     setSearchParams(params) {
       params.moldlineId = this.moldlineId
-      if(!params.moldlineId||!params.moldingDate||!params.moldingBatch||!params.moldlineGroupNo)
-      {
-        params.notData='notData';//不返回数据
-      }
-      else {
-        params.notData=null;
-      }
       return params
     },
     /**
@@ -225,7 +218,6 @@ export default {
         userCode:'',//编码
         clockId: '',//打卡id
       }
-      this.moldlineId = null
     },
     /**
      * @desc   : 参数赋值

src/view/pdm/process-node-reverse/add.vue

@@ -173,7 +173,7 @@
               this.formData.carrierCode = res.data.carrierCode
             } else {
               this.formData.barCode= null
-              this.$Message.error(res.message)
+              this.$Message.warning(res.message)
             }
           })
         }
@@ -225,7 +225,7 @@
       validDataRow() {
         if (this.detailList.length > 0) {
           if (this.detailList.filter(it => it.barCode == this.formData.barCode).length > 0) {
-            this.$Message.error(this.$t('W_120'))
+            this.$Message.warning(this.$t('W_120'))
             return false
           }
         }
@@ -256,7 +256,7 @@
        */
       validData(){
         if(this.detailList.length > 0 &&this.formData.barCode){
-          this.$Message.error(this.$t('W_132'))
+          this.$Message.warning(this.$t('W_132'))
           return false
         }
         return true

src/view/pdm/prod-carryover/index.vue

@@ -232,7 +232,7 @@ export default {
               if (res.code === this.$config.SUCCESS_CODE) {
                 this.$Message.success(this.$t('I_001', {'param': this.$v('reverseCarryover')}))
               } else {
-                this.$Message.error(res.message)
+                this.$Message.warning(res.message)
               }
             })
           },
@@ -262,7 +262,7 @@ export default {
      */
     validData() {
       if(new Date(this.formData.dateEnd).getTime() >= new Date().getTime()){
-        this.$Message.error(this.$t('Q_014'))
+        this.$Message.warning(this.$t('Q_014'))
         return false;
       }
       return true;

src/view/pdm/prod-check/form.vue

@@ -239,7 +239,7 @@ export default {
       let noList = []
       noList = noList.concat(this.detailList.copy().filter(f => f.userId).map(m => m.userId))
       if (noList.length != noList.unique().length) {
-        this.$Message.error(this.$t('W_121'))
+        this.$Message.warning(this.$t('W_121'))
         return false
       }
       return true

src/view/pdm/prod-check/index.vue

@@ -308,7 +308,7 @@
             this.formData.barCode = null
             this.getDetail(1)
           }else{
-            this.$Message.error(res.message)
+            this.$Message.warning(res.message)
           }
         })
       },
@@ -332,7 +332,7 @@
               }
             })
         } else {
-          this.$Message.error(this.$t('W_124'))
+          this.$Message.warning(this.$t('W_124'))
         }
       },
       /**
@@ -350,7 +350,7 @@
             this.$Message.success(res.message)
             this.getDetail(1)
           }else{
-            this.$Message.error(res.message)
+            this.$Message.warning(res.message)
           }
         })
       },

src/view/pdm/prod-code-change/index.vue

@@ -56,7 +56,7 @@
     >
       <BaseIndexButtonGroup id="ButtonGroup">
         <template #left>
-          <BaseIndexButton ref="search" name="search" @click="selectProcudt"></BaseIndexButton>
+          <BaseIndexButton ref="searchProcudt" name="search" @click="selectProcudt"></BaseIndexButton>
           <BaseIndexButton :finalFlag="true" ref="clear" name="clear"
                            @click="$refs['searchCond'].clearCondition()"></BaseIndexButton>
         </template>
@@ -166,7 +166,7 @@
           //成型日期
           {
             itemCode: 'moldingDate',
-            valueFormat: { code: 'moldingDate', default: new Date().toDateStr() },
+            valueFormat: { code: 'moldingDate'},
             valueKind: 'DATE',
             clearable: false
           },
@@ -177,7 +177,7 @@
           //产品条码
           {
             itemCode: 'pdtBarcode',
-            valueFormat: { code: 'pdtUniqueId' },
+            valueFormat: { code: 'productId' },
             itemName: 'pdtBarcode',
             valueKind: self.$config.docUserInput.sSearch,//单选/多选放大镜
             magnifierType: self.$config.MagnifierType.getProductModel,
@@ -315,7 +315,12 @@
        */
       validData() {
         if (!this.formData.pdtModelId) {
-          this.$Message.error(this.$t('W_139'))
+          this.$Message.warning(this.$t('W_139'))
+          return false
+        }
+        let arr = this.$refs['detail-table-select'].$refs.table.getCheckboxRecords()
+        if(arr.length==0){
+          this.$Message.warning(this.$t('W_153'))
           return false
         }
         return true

src/view/pdm/prod-defect/add.vue

@@ -59,7 +59,7 @@
       <!--报损信息-->
       <DkPanel prop="LossReportingInformation">
         <!--  下拉区域  -->
-        <DkForm slot="content" ref="formInline" v-model="LossReportingFormData" style="width: 95%">
+        <DkForm slot="content" ref="formInline" v-model="LossReportingFormData" style="width: 95%" :col-count="5">
           <!--产品分级-->
           <DkFormItem prop="opnGradeId" :required="true" :label="$t('gradeClassification')" data-type="number">
             <SelectPop v-model="LossReportingFormData.opnGradeId" ref="gradeName" :multiple="false"
@@ -78,6 +78,15 @@
                        valueKey="defectId">
             </SelectPop>
           </DkFormItem>
+          <!--责任工序-->
+          <DkFormItem :required="true" prop="blameNodeId" :label="$t('blameNodeId')">
+            <SelectPop v-model="LossReportingFormData.blameNodeId" ref="blameNodeId" :multiple="false"
+                       :options="nodeList"
+                       @on-select="chooseNode"
+                       labelKey="flowNodeName"
+                       valueKey="flowNodeId">
+            </SelectPop>
+          </DkFormItem>
           <!--责任工号-->
           <DkFormItem :required="true" prop="blameUserId"
                       :data-type="$config.dataType.number" :label="$t('blameUserId')">
@@ -168,12 +177,14 @@
           gradeName: null,//产品分级
           pdtDefectId: null,//损柸原因
           defectName: null,//损柸原因
+          blameNodeId: null,//责任工序
           remarks: null,
         },
         flowNodeId: self.$route.meta.menuUuid,
         gradeList: [],//产品分级
         damageList: [],//损柸原因
         detailList: [],// 明细信息
+        nodeList: [],//责任工序
         // 明细列表
         detailColumns: [
           // 产品条码
@@ -251,9 +262,10 @@
               this.formData.pdtFlowNodeName = res.data.pdtFlowNodeName
               this.formData.carrierCode = res.data.carrierCode
               this.formData.moldlineName = res.data.moldlineName
+              this.nodeList = res.data.productionList
             } else {
               this.formData.barCode = null
-              this.$Message.error(res.message)
+              this.$Message.warning(res.message)
             }
           })
         }
@@ -290,7 +302,7 @@
               i.blameWsJobId = i.jobId
             }
           } else {
-            this.$Message.error(res.message)
+            this.$Message.warning(res.message)
           }
         })
       },
@@ -323,6 +335,19 @@
         }
       },
       /**
+       * @desc   : 选择责任工序
+       * @author : 洪旭东
+       * @date   : 2023-05-10 10:45
+       */
+      chooseNode (row) {
+        if (row) {
+          console.log(row)
+          this.LossReportingFormData.blameUserId = this.nodeList.filter(f => f.flowNodeId == row)[0].prodUserId
+          this.LossReportingFormData.userName = this.nodeList.filter(f => f.flowNodeId == row)[0].prodUserName
+          console.log(this.LossReportingFormData)
+        }
+      },
+      /**
        *   @desc   : 删除提交行数据
        *   @date   : 2023/3/10 11:26
        *   @author : 寇珊珊
@@ -369,7 +394,7 @@
       validDataRow() {
         if (this.detailList.length > 0) {
           if (this.detailList.filter(it => it.barCode == this.formData.barCode).length > 0) {
-            this.$Message.error(this.$t('W_120'))
+            this.$Message.warning(this.$t('W_120'))
             return false
           }
         }
@@ -407,11 +432,11 @@
        */
       validData() {
         if (this.detailList.length > 0 && this.formData.barCode) {
-          this.$Message.error(this.$t('W_132'))
+          this.$Message.warning(this.$t('W_132'))
           return false
         }
         if (this.$refs['staff-table-select'].$refs.table.getCheckboxRecords().length == 0) {
-          this.$Message.error(this.$t('W_133'))
+          this.$Message.warning(this.$t('W_133'))
           return false
         }
         return true

src/view/pdm/prod-defect/reverse.vue

@@ -165,7 +165,7 @@
               this.formData.remarks = res.data.prodRemarks//备注
             } else {
               this.formData.barCode = null
-              this.$Message.error(res.message)
+              this.$Message.warning(res.message)
             }
           })
         }
@@ -217,7 +217,7 @@
       validDataRow() {
         if (this.detailList.length > 0) {
           if (this.detailList.filter(it => it.barCode == this.formData.barCode).length > 0) {
-            this.$Message.error(this.$t('W_120'))
+            this.$Message.warning(this.$t('W_120'))
             return false
           }
         }
@@ -244,7 +244,7 @@
        */
       validData() {
         if (this.formData.barCode) {
-          this.$Message.error(this.$t('W_132'))
+          this.$Message.warning(this.$t('W_132'))
           return false
         }
         return true

src/view/pdm/prod-logo-colour/index.vue

@@ -313,7 +313,7 @@ export default {
      */
     validData() {
       if (!this.formData.pdtLogoId && !this.formData.pdtColourId) {
-        this.$message.error(this.$t('W_101'))
+        this.$Message.warning(this.$t('W_101'))
         return false;
       }
       return true;

src/view/pdm/prod-suspend/form.vue

@@ -236,7 +236,7 @@ export default {
                   this.productList = table.concat(list)
                 }
               } else {
-                this.$Message.error(this.$t('W_006'))
+                this.$Message.warning(this.$t('W_006'))
               }
 
               // this.productList.forEach(it => {

src/view/pdm/prod-suspend/index.vue

@@ -114,7 +114,7 @@ export default {
       let keys = this.$refs['table-select'].batchKeys
       let suspendId = keys[0]
       if (keys.length === 0) {
-        this.$Message.error(this.$t('W_013'))
+        this.$Message.warning(this.$t('W_013'))
       } else {
         this.$IBMessage({
             content: this.$t('Q_002', {'param': this.$v('reverse')}),

src/view/pdm/thmeter-record/index.vue

@@ -174,7 +174,7 @@
       validData() {
         this.params = this.detailData.filter(it => it.temperature || it.humidity || it.remarks)
         if (this.params && this.params.length == 0) {
-          this.$Message.error(this.$t('W_130'))
+          this.$Message.warning(this.$t('W_130'))
           return false
         }
         return true

src/view/pdm/work-record/index.vue

@@ -255,12 +255,12 @@
           this.excute(this.$service.commonService, this.$service.commonService.getUser, params).then(res => {
             if (res.code === this.$config.SUCCESS_CODE) {
               if (res.data && res.data.length == 0) {
-                this.$Message.error(this.$t('W_138'))
+                this.$Message.warning(this.$t('W_138'))
               } else {
                 this.formData.userId = res.data[0].userId
               }
             } else {
-              this.$Message.error(res.message)
+              this.$Message.warning(res.message)
             }
           })
         }

src/view/pdm/work-station/form.vue

@@ -284,7 +284,7 @@ export default {
         if (res.code == this.$config.SUCCESS_CODE) {
           this.printerList = res.data
         } else {
-          this.$Message.error(res.message)
+          this.$Message.warning(res.message)
         }
       })
     },
@@ -434,7 +434,7 @@ export default {
     validData() {
       // 判断是否有用户信息
       // if (!this.formData.workStationUserList || this.formData.workStationUserList.length === 0) {
-      //   this.$message.error(this.$t('W_111'))
+      //   this.$Message.warning(this.$t('W_111'))
       //   return false;
       // }
      let userData = this.$refs.editTableWSUser.getTableData();
@@ -443,11 +443,11 @@ export default {
           continue;
         }
         if (!userData[i].userId) {
-          this.$Message.error(this.$t('userInformation') + '：' + this.$t('W_089', {'param1': (i + 1), 'param2': this.$t('userName')}) + ';')
+          this.$Message.warning(this.$t('userInformation') + '：' + this.$t('W_089', {'param1': (i + 1), 'param2': this.$t('userName')}) + ';')
           return false;
         }
         if (!userData[i].userKind) {
-          this.$Message.error(this.$t('userInformation') + '：'  + this.$t('W_089', {'param1': (i + 1), 'param2': this.$t('userKind')}) + ';')
+          this.$Message.warning(this.$t('userInformation') + '：'  + this.$t('W_089', {'param1': (i + 1), 'param2': this.$t('userKind')}) + ';')
           return false;
         }
       }
@@ -459,11 +459,11 @@ export default {
           continue;
         }
         if (!printer[i].printerId) {
-          this.$Message.error(this.$t('printerInformation') + '：' + this.$t('W_089', {'param1': (i + 1), 'param2': this.$t('printerId')}) + ';')
+          this.$Message.warning(this.$t('printerInformation') + '：' + this.$t('W_089', {'param1': (i + 1), 'param2': this.$t('printerId')}) + ';')
           return false;
         }
         if (!printer[i].printLayoutId && !printer[i].printType) {
-          this.$Message.error(this.$t('printerInformation') + '：' + this.$t('W_089', {'param1': (i + 1), 'param2': this.$t('printLayoutId') + this.$t('or') + this.$t('printType')}) + ';')
+          this.$Message.warning(this.$t('printerInformation') + '：' + this.$t('W_089', {'param1': (i + 1), 'param2': this.$t('printLayoutId') + this.$t('or') + this.$t('printType')}) + ';')
           return false;
         }
       }

src/view/pdm/work-station/index.vue

@@ -324,11 +324,11 @@ export default {
           continue;
         }
         if (!printer[i].printerId) {
-          this.$Message.error(this.$t('printerInformation') + '：' + this.$t('W_089', {'param1': (i + 1), 'param2': this.$t('printerId')}) + ';')
+          this.$Message.warning(this.$t('printerInformation') + '：' + this.$t('W_089', {'param1': (i + 1), 'param2': this.$t('printerId')}) + ';')
           return false;
         }
         if (!printer[i].printLayoutId && !printer[i].printType) {
-          this.$Message.error(this.$t('printerInformation') + '：' + this.$t('W_089', {'param1': (i + 1), 'param2': this.$t('printLayoutId') + this.$t('or') + this.$t('printType')}) + ';')
+          this.$Message.warning(this.$t('printerInformation') + '：' + this.$t('W_089', {'param1': (i + 1), 'param2': this.$t('printLayoutId') + this.$t('or') + this.$t('printType')}) + ';')
           return false;
         }
       }

src/view/pdm/ws-clock/clock-user.vue

@@ -198,13 +198,13 @@ export default {
         let table = this.$refs.editTableWsClockItem.getTableData();
         // 判断是否有打卡明细信息
         if (!table || table.length === 0) {
-          this.$message.error(this.$t('W_103'))
+          this.$Message.warning(this.$t('W_103'))
           return false;
         }
         for (let i = 0; i < table.length; i++) {
           // 员工和替班员工需要 二选一
           if (!table[i].staffId && !table[i].replaceStaffId) {
-            this.$Message.error(this.$t('W_107', {'param1': (i + 1)}))
+            this.$Message.warning(this.$t('W_107', {'param1': (i + 1)}))
             this.setErrToRow(table[i], this.$t('W_108'));// 给行增加错误提示信息
             return false;
           }

src/view/pdm/ws-clock/form.vue

@@ -186,13 +186,18 @@ export default {
      * @date   : 2023/3/1 15:34
      */
     chooseData(row, rowIndex, colItem) {
+      console.log('444',colItem.field,row,this.wsClockItemList[rowIndex])
       // 如果选择员工需要清空替班，选择替班需要清空员工
       if (colItem.field === 'staffName') {
+        this.$set(this.wsClockItemList[rowIndex], 'staffId_Name', row['staffName'])
         this.$set(this.wsClockItemList[rowIndex], 'replaceStaffId', null);
+        this.$set(this.wsClockItemList[rowIndex], 'replaceStaffId_Name', null);
         this.$set(this.wsClockItemList[rowIndex], 'replaceStaffName', null)
       } else if (colItem.field === 'replaceStaffName') {
         this.$set(this.wsClockItemList[rowIndex], 'staffId', null);
         this.$set(this.wsClockItemList[rowIndex], 'staffName', null)
+        this.$set(this.wsClockItemList[rowIndex], 'staffId_Name', null)
+        this.$set(this.wsClockItemList[rowIndex], 'replaceStaffId_Name', row['staffName'])
       }
     },
     /**
@@ -273,14 +278,14 @@ export default {
       let table = this.$refs.editTableWsClockItem.getTableData();
       // 判断是否有打卡明细信息
       if (!table || table.length === 0) {
-        this.$message.error(this.$t('W_103'))
+        this.$Message.warning(this.$t('W_103'))
         return false;
       }
       if(this.type === this.$config.formMode.add){  // 新建
         for (let i = 0; i < table.length; i++) {
           // 员工和替班员工需要 二选一
           if (!table[i].staffId && !table[i].replaceStaffId) {
-            this.$Message.error(this.$t('W_107', {'param1': (i + 1)}))
+            this.$Message.warning(this.$t('W_107', {'param1': (i + 1)}))
             this.setErrToRow(table[i], this.$t('W_108'));// 给行增加错误提示信息
             return false;
           }

src/view/process/process-flow/process-setting.vue

@@ -216,7 +216,7 @@ export default {
           this.close()
         } else {
           // 如果不成功就提示错误信息
-          this.$Message.error(res.message)
+          this.$Message.warning(res.message)
         }
       })
     },
@@ -231,26 +231,26 @@ export default {
       let startNodes = allNodes.filter(it=>it.getData()?.flowKind===this.$config.flowKind.start)
       let endNodes = allNodes.filter(it=>it.getData()?.flowKind===this.$config.flowKind.end)
       if(allNodes.length<2){
-        this.$Message.error('流程中应至少包含2个节点')
+        this.$Message.warning('流程中应至少包含2个节点')
         return false
       }
       if(allEdges.length<1){
-        this.$Message.error('流程中应至少包含1条线')
+        this.$Message.warning('流程中应至少包含1条线')
         return false
       }
       if(startNodes.length<1){
-        this.$Message.error('流程中应至少包含1个开始节点')
+        this.$Message.warning('流程中应至少包含1个开始节点')
         return false
       }
       if(endNodes.length<1){
-        this.$Message.error('流程中应至少包含1个结束节点')
+        this.$Message.warning('流程中应至少包含1个结束节点')
         return false
       }
       //检查所有开始节点是否能够连接到结束节点
       let startNodesNoCloseLoop=startNodes.filter(it=>{
         let endCount = this.graph.getSuccessors(it)?.filter(it=>it.getData()?.flowKind===this.$config.flowKind.end)
         if (endCount<1) {
-          this.$Message.error('开始节点为 [' + it.getData()?.nodeName + '] 的流程未闭环，请检查')
+          this.$Message.warning('开始节点为 [' + it.getData()?.nodeName + '] 的流程未闭环，请检查')
           return true
         }
       })
@@ -260,7 +260,7 @@ export default {
       let endNodesNoCloseLoop=endNodes.filter(it=>it.getData()?.nodeKind!==this.$config.nodeKind.recover).filter(it=>{
         let startCount = this.graph.getPredecessors(it)?.filter(it=>it.getData()?.flowKind===this.$config.flowKind.start)
         if (startCount<1) {
-          this.$Message.error('结束节点为 [' + it.getData()?.nodeName + '] 的流程未闭环，请检查')
+          this.$Message.warning('结束节点为 [' + it.getData()?.nodeName + '] 的流程未闭环，请检查')
           return true
         }
       })
@@ -269,7 +269,7 @@ export default {
       //节点的单个校验未通过
       let invalidNodes =allNodes.filter(it => {
         if (it.getAttrs()?.body?.stroke === 'red') {
-          this.$Message.error('[' + it.getData()?.nodeName + '] 节点设置有误，请检查')
+          this.$Message.warning('[' + it.getData()?.nodeName + '] 节点设置有误，请检查')
           return true
         }
       })
@@ -292,7 +292,7 @@ export default {
             //查询是否存在绑定的成型线
             this.excute(this.$service.processService, this.$service.processService.getBindMolding, shapingNodes).then(res => {
               if (res.code === this.$config.SUCCESS_CODE&&res.data.length) {
-                this.$Message.error('无法删除已被成型线绑定的节点')
+                this.$Message.warning('无法删除已被成型线绑定的节点')
               }
               else{
                 this.graph.removeCells(cells)

src/view/report/kiln-car-status-report/index.vue

@@ -2,8 +2,7 @@
 <template>
   <div class="main-div" ref="mainDiv">
     <!--加载中-->
-    <loading :loading="loading"></loading>
-
+    <loading :loading="loading" v-if="!modalVisible"></loading>
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>
         <!--    查询    -->
@@ -23,24 +22,24 @@
     <!--  表格部分  -->
     <div :style="'height: ' + tableHeight + 'px'" class="split-div-class">
       <DkSplit mode="vertical" v-model="split" :height="tableHeight">
-        <DkTable slot="top" :id="'table-'+$options.name" ref="table-select" :data="tableData" multiple
-                 :height="this.tableHeight * split - 45" primaryKey="uniqueId" @pageChange="pageSizeChange"
+        <DkTable slot="top" :id="'table-'+$options.name" ref="table-select" :data="tableData"
+                 :height="this.tableHeight * split - 45"
+                 primaryKey="uniqueId"
+                 :choose-flag="false"
+                 @pageChange="pageSizeChange"
                  :pageFlag="true"
                  :page-total="pageInfo.total"
                  :current-page="pageInfo.currentPage"
                  @current-change="currentChange($event)"
                  name="table">
           <!-- 窑炉编码 -->
-          <DkTableColumn field="kilnCode" width="200px" type="link"
-                         @on-link="handleLink(Object.assign($event,{button:'edit'}))"></DkTableColumn>
-          <!-- 窑炉类型 -->
-          <DkTableColumn field="kilnType"></DkTableColumn>
+          <DkTableColumn field="kilnCode" width="200px" ></DkTableColumn>
           <!-- 窑车编码 -->
-          <DkTableColumn field="carCode"></DkTableColumn>
+          <DkTableColumn field="carNo" :title="$t('carCode')"></DkTableColumn>
           <!-- 当前工序 -->
           <DkTableColumn field="currentNode"></DkTableColumn>
           <!-- 最大产品数量 -->
-          <DkTableColumn field="maxProductNum"></DkTableColumn>
+          <DkTableColumn  field="maxProductNum"  :dataType="$config.dataType.number"></DkTableColumn>
         </DkTable>
 
         <!--明细-->
@@ -56,9 +55,9 @@
                    :choose-flag="false"
                    :data="productionDataData">
             <!-- 当前工序-->
-            <DkTableColumn field="currentNode" width="180px"></DkTableColumn>
-            <!-- 开始时间-->
-            <DkTableColumn field="startTime"></DkTableColumn>
+            <DkTableColumn field="currentNode"  :title="$t('reasonPdtFlowNodeName')"  width="180px"></DkTableColumn>
+            <!-- 创建时间-->
+            <DkTableColumn field="opCreateTime" :title="$t('operationTime')"  :dataType="$config.dataType.dateTime"></DkTableColumn>
             <!-- 生产工号-->
             <DkTableColumn field="makeUserId"></DkTableColumn>
             <!-- 操作者-->
@@ -81,13 +80,13 @@
             <!-- 产品编码-->
             <DkTableColumn field="productCode"></DkTableColumn>
             <!-- 窑车位置-->
-            <DkTableColumn field="kilnCarPlace"></DkTableColumn>
+            <DkTableColumn  field="rangeNo" :title="$t('kilnCarPlace')"></DkTableColumn>
             <!-- 生产工号-->
-            <DkTableColumn field="prodUserCode"></DkTableColumn>
+            <DkTableColumn field="proUserCode"  :title="$t('makeUserId')" ></DkTableColumn>
             <!-- 员工姓名-->
             <DkTableColumn field="staffNames"></DkTableColumn>
             <!-- 操作时间-->
-            <DkTableColumn field="operationTime"></DkTableColumn>
+            <DkTableColumn field="operationTime" :dataType="$config.dataType.dateTime"></DkTableColumn>
             <!-- 操作者-->
             <DkTableColumn field="opnUserName"></DkTableColumn>
           </DkTable>