Procházet zdrojové kódy

修改错误日志提示信息从error修改为warning

周兴 před 2 roky
rodič
revize
3d7b56fe9e
100 změnil soubory, kde provedl 445 přidání a 425 odebrání
  1. 1 1
      src/components/base/custom-report/custom-report.vue
  2. 1 1
      src/components/base/dk-approval-flow/dk-approval-flow.vue
  3. 2 2
      src/components/base/dk-approval-flow/drawer/approverDrawer.vue
  4. 1 1
      src/components/base/dk-approval-flow/drawer/conditionDrawer.vue
  5. 1 1
      src/components/base/dk-approval-flow/drawer/copyerDrawer.vue
  6. 1 1
      src/components/base/dk-export/dk-export.vue
  7. 1 1
      src/components/base/dk-pic-wall/dk-pic-wall.vue
  8. 1 1
      src/components/base/dk-position/dk-position.vue
  9. 7 2
      src/components/base/dk-table/dk-table-column.vue
  10. 10 2
      src/components/base/dk-table/dk-table.vue
  11. 2 2
      src/components/base/edit-table/edit-table.vue
  12. 7 7
      src/components/base/edit-tree-table/edit-tree-table.vue
  13. 1 1
      src/components/business/approval-detail-table/approval-detail-table.vue
  14. 3 3
      src/components/business/modal-receipt/modal-receipt.vue
  15. 3 2
      src/components/business/modal-search-form/index.vue
  16. 1 1
      src/components/business/modal_batch_edit/modal_batch_edit.vue
  17. 3 3
      src/components/business/multi-select/multi-select.vue
  18. 1 1
      src/components/business/print/button.vue
  19. 1 1
      src/components/business/print/index.vue
  20. 3 3
      src/components/business/print/modal.vue
  21. 6 6
      src/components/business/print/template.vue
  22. 4 4
      src/components/business/process/node-modal/node-modal.vue
  23. 1 1
      src/components/business/pull-cond/erp.vue
  24. 1 1
      src/components/business/pull-cond/index.vue
  25. 7 7
      src/components/business/search-cond/index.vue
  26. 12 6
      src/components/business/select-magnifier/select-magnifier.vue
  27. 3 3
      src/components/business/table-select/table-select.vue
  28. 1 1
      src/components/business/wangeditor/index.vue
  29. 1 1
      src/components/hegii/VideoUpload/index.vue
  30. 7 7
      src/components/main/components/user/user.vue
  31. 2 2
      src/mixins/form.js
  32. 9 9
      src/mixins/index.js
  33. 5 5
      src/mixins/price.js
  34. 4 4
      src/mixins/process.js
  35. 1 1
      src/view/core/factory/index.vue
  36. 1 1
      src/view/core/role/index.vue
  37. 3 3
      src/view/core/staff/index.vue
  38. 1 1
      src/view/core/system-setting/index.vue
  39. 3 3
      src/view/core/user/form.vue
  40. 8 8
      src/view/core/user/index.vue
  41. 3 3
      src/view/core/user/purview-multiple.vue
  42. 5 5
      src/view/core/user/purview.vue
  43. 1 1
      src/view/login/login.vue
  44. 1 1
      src/view/login/qv-login.vue
  45. 4 4
      src/view/mst/carr-kiln-car/index.vue
  46. 13 13
      src/view/mst/custom-report/form.vue
  47. 2 2
      src/view/mst/custom-report/index.vue
  48. 2 2
      src/view/mst/label-print-layout/setting.vue
  49. 1 1
      src/view/mst/model-mould-change/index.vue
  50. 6 6
      src/view/mst/model-product/form.vue
  51. 2 2
      src/view/mst/model/index.vue
  52. 11 11
      src/view/mst/molding/form.vue
  53. 2 2
      src/view/mst/mould-carryover/index.vue
  54. 2 2
      src/view/mst/mould-check/form.vue
  55. 2 2
      src/view/mst/mould-check/index.vue
  56. 2 2
      src/view/mst/mould-manager/index.vue
  57. 1 1
      src/view/mst/mould/form.vue
  58. 5 5
      src/view/mst/mould/index.vue
  59. 8 8
      src/view/mst/product-view/form.vue
  60. 1 1
      src/view/pdm/carrier-flow-pdt/index.vue
  61. 6 6
      src/view/pdm/data-collection/climbKiln-add.vue
  62. 22 22
      src/view/pdm/data-collection/finishCheck-add.vue
  63. 22 22
      src/view/pdm/data-collection/halfCheck-add.vue
  64. 21 21
      src/view/pdm/data-collection/halfCheck-touch-add.vue
  65. 5 5
      src/view/pdm/data-collection/inKiln-add.vue
  66. 5 5
      src/view/pdm/data-collection/outKiln-add.vue
  67. 4 4
      src/view/pdm/data-collection/recover-add.vue
  68. 7 7
      src/view/pdm/data-collection/register-add.vue
  69. 4 4
      src/view/pdm/data-collection/uninstallKiln-add.vue
  70. 6 6
      src/view/pdm/molding-record/bind-barcode-group.vue
  71. 9 9
      src/view/pdm/molding-record/bind-barcode-grouping.vue
  72. 6 6
      src/view/pdm/molding-record/bind-barcode.vue
  73. 4 4
      src/view/pdm/molding-record/damage.vue
  74. 13 13
      src/view/pdm/molding-record/form.vue
  75. 1 1
      src/view/pdm/molding-record/index.vue
  76. 3 3
      src/view/pdm/process-node-reverse/add.vue
  77. 2 2
      src/view/pdm/prod-carryover/index.vue
  78. 1 1
      src/view/pdm/prod-check/form.vue
  79. 3 3
      src/view/pdm/prod-check/index.vue
  80. 2 2
      src/view/pdm/prod-code-change/index.vue
  81. 5 5
      src/view/pdm/prod-defect/add.vue
  82. 3 3
      src/view/pdm/prod-defect/reverse.vue
  83. 1 1
      src/view/pdm/prod-logo-colour/index.vue
  84. 1 1
      src/view/pdm/prod-suspend/form.vue
  85. 1 1
      src/view/pdm/prod-suspend/index.vue
  86. 1 1
      src/view/pdm/thmeter-record/index.vue
  87. 2 2
      src/view/pdm/work-record/index.vue
  88. 6 6
      src/view/pdm/work-station/form.vue
  89. 2 2
      src/view/pdm/work-station/index.vue
  90. 2 2
      src/view/pdm/ws-clock/clock-user.vue
  91. 2 2
      src/view/pdm/ws-clock/form.vue
  92. 9 9
      src/view/process/process-flow/process-setting.vue
  93. 8 8
      src/view/sale/order/form.vue
  94. 18 18
      src/view/sale/order/index.vue
  95. 11 11
      src/view/sale/order/return-and-exchange.vue
  96. 2 2
      src/view/sale/order/sale-refund-detail.vue
  97. 7 7
      src/view/sale/order/sale-refund.vue
  98. 1 1
      src/view/sale/order/sale-return-detail.vue
  99. 4 4
      src/view/sale/order/sale-return-reverse.vue
  100. 8 8
      src/view/sale/order/sale-return.vue

+ 1 - 1
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)
         }
       })
     },

+ 1 - 1
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);
           }
         })

+ 2 - 2
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)
         }
       })
     },

+ 1 - 1
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)
         }
       })
     }

+ 1 - 1
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)
         }
       })
     },

+ 1 - 1
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 = {}

+ 1 - 1
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)
       }
     },
 

+ 1 - 1
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
       }

+ 7 - 2
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);
       }
     },

+ 10 - 2
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)
             }
           })
         }

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

@@ -2505,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);
               }
@@ -2524,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);
             }

+ 7 - 7
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
         }
         // 关闭弹窗

+ 1 - 1
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)
         }
       })
     }

+ 3 - 3
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')
             }))

+ 3 - 2
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)
         }
       })
     },

+ 1 - 1
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;

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

@@ -401,7 +401,7 @@ export default {
             }
           }
         } else {
-          this.$Message.error(res.message)
+          this.$Message.warning(res.message)
         }
       })
     },
@@ -473,7 +473,7 @@ export default {
      */
     checkBatch() {
       if (this.batchKeysPage.length <= 0) {
-        this.$Message.error('请先选择数据')
+        this.$Message.warning('请先选择数据')
         return false
       }
       return true
@@ -504,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

+ 1 - 1
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)
         }
       })
     }

+ 1 - 1
src/components/business/print/index.vue

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

+ 3 - 3
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)
         }
       })
     }

+ 6 - 6
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)
       }
       })
     },

+ 4 - 4
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

+ 1 - 1
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
       })

+ 1 - 1
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
         })

+ 7 - 7
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)
         }
       })
     },

+ 12 - 6
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"
       >
@@ -549,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)
         }
       })
     },
@@ -634,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(',')
       }
@@ -654,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 = []
@@ -762,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;
@@ -797,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;
         }
       })
@@ -909,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

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

@@ -532,7 +532,7 @@ export default {
           //显示可替换的界面
           this.showChild = true;
         } else {
-          this.$Message.error(res.message)
+          this.$Message.warning(res.message)
         }
       })
     },
@@ -823,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)
           }
         })
       })
@@ -954,7 +954,7 @@ export default {
           }
           this.loading = false;
         } else {
-          this.$Message.error(res.message)
+          this.$Message.warning(res.message)
           this.loading = false;
         }
       })

+ 1 - 1
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)
           }
         })
       },

+ 1 - 1
src/components/hegii/VideoUpload/index.vue

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

+ 7 - 7
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)
       }
     },
     /**

+ 2 - 2
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) {

+ 9 - 9
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)
               }
             })
           }

+ 5 - 5
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)
           }
         })
       }

+ 4 - 4
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)
       }
     },
     /**

+ 1 - 1
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;

+ 1 - 1
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)
         }
       })
     },

+ 3 - 3
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

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

@@ -244,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;
           }
         }

+ 3 - 3
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', {

+ 8 - 8
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'))
       }
     },
     /**

+ 3 - 3
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
       // })

+ 5 - 5
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)
         }
       })
     }

+ 1 - 1
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
       })

+ 1 - 1
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
           })

+ 4 - 4
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 = []

+ 13 - 13
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;

+ 2 - 2
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}))

+ 2 - 2
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
       //   }
       // })

+ 1 - 1
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)

+ 6 - 6
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;
           //   }
           // }

+ 2 - 2
src/view/mst/model/index.vue

@@ -592,7 +592,7 @@ export default {
         for (let index = 0; index < table.length; index++) {
           let it = table[index]
           if (!it.pdtModelId || it.pdtModelId.length === 0) {
-            this.$Message.error(this.$t('W_069', {
+            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', {
@@ -847,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)

+ 11 - 11
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
           }
         }

+ 2 - 2
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;

+ 2 - 2
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

+ 2 - 2
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'))
         }
       },
       /**

+ 2 - 2
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')}),

+ 1 - 1
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;

+ 5 - 5
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;

+ 8 - 8
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)
           }
         })
       }

+ 1 - 1
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'))
         }
       },
       /**

+ 6 - 6
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)
           }
         })
       },

+ 22 - 22
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)
           }
         })
       },

+ 22 - 22
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)
           }
         })
       },

+ 21 - 21
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)
           }
         })
       },

+ 5 - 5
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)
           }
         })
       },

+ 5 - 5
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)
           }
         })
       },

+ 4 - 4
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)
           }
         })
       },

+ 7 - 7
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)
           }
         })
       },

+ 4 - 4
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)
           }
         })
       },

+ 6 - 6
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

+ 9 - 9
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
             }
           }

+ 6 - 6
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

+ 4 - 4
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;

+ 13 - 13
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')
           }))

+ 1 - 1
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'))
         }
       }
     },

+ 3 - 3
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

+ 2 - 2
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;

+ 1 - 1
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

+ 3 - 3
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)
           }
         })
       },

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

@@ -315,12 +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.error(this.$t('W_153'))
+          this.$Message.warning(this.$t('W_153'))
           return false
         }
         return true

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

@@ -265,7 +265,7 @@
               this.nodeList = res.data.productionList
             } else {
               this.formData.barCode = null
-              this.$Message.error(res.message)
+              this.$Message.warning(res.message)
             }
           })
         }
@@ -302,7 +302,7 @@
               i.blameWsJobId = i.jobId
             }
           } else {
-            this.$Message.error(res.message)
+            this.$Message.warning(res.message)
           }
         })
       },
@@ -394,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
           }
         }
@@ -432,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

+ 3 - 3
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

+ 1 - 1
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;

+ 1 - 1
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 => {

+ 1 - 1
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')}),

+ 1 - 1
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

+ 2 - 2
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)
             }
           })
         }

+ 6 - 6
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;
         }
       }

+ 2 - 2
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;
         }
       }

+ 2 - 2
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;
           }

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

@@ -278,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;
           }

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

@@ -172,7 +172,7 @@ export default {
           this.close()
         } else {
           // 如果不成功就提示错误信息
-          this.$Message.error(res.message)
+          this.$Message.warning(res.message)
         }
       })
     },
@@ -187,26 +187,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
         }
       })
@@ -216,7 +216,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
         }
       })
@@ -225,7 +225,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
         }
       })
@@ -249,7 +249,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)

+ 8 - 8
src/view/sale/order/form.vue

@@ -1105,7 +1105,7 @@ export default {
       if (response.code == 200) {
         this.formData.files.push(response.data)
       } else {
-        this.$Message.error(response.message)
+        this.$Message.warning(response.message)
       }
     },
     /**
@@ -1278,19 +1278,19 @@ export default {
       // 判断客户的省市区不存在,那么就要重新选addressGcj02
       if (!this.formData.addressArea || typeof this.formData.addressArea == null
         || this.formData.addressArea.province == null) {
-        this.$message.error(this.$t('W_061', {'param': this.$t('addressArea')}))
+        this.$Message.warning(this.$t('W_061', {'param': this.$t('addressArea')}))
         return false;
       }
       // 判断经纬度是否存在
       if (!this.formData.addressGcj02) {
-        this.$message.error(this.$t('W_061', {'param': this.$t('addressGcj02')}))
+        this.$Message.warning(this.$t('W_061', {'param': this.$t('addressGcj02')}))
         return false;
       }
       // 明细必须有数据
       let table = this.getTableChangeData();
       // if (this.type === this.$config.formMode.add) {
       //   if (!table || table.length === 0) {
-      //     this.$message.error(this.$t('W_012'))
+      //     this.$Message.warning(this.$t('W_012'))
       //     resolve(false);
       //   }
       // }
@@ -1303,13 +1303,13 @@ export default {
             continue;
           }
           if (!table[i]['itemQuantity'] || table[i]['itemQuantity'].toNum() === 0) {
-            this.$message.error(this.$t('W_041', {'param': this.$t('sequence') + (i + 1) + this.$t('rowNo') + this.$t('itemQuantity')}))
+            this.$Message.warning(this.$t('W_041', {'param': this.$t('sequence') + (i + 1) + this.$t('rowNo') + this.$t('itemQuantity')}))
             this.$set(table[i], 'info', this.$t('W_041', {'param': this.$t('sequence') + (i + 1) + this.$t('rowNo') + this.$t('itemQuantity')}));
             return false;
           }
           //校验标价折扣是否超过范围
           if (table[i]['discountStandard'] && parseFloat(table[i]['discountStandard']) > this.$config.maxDiscount) {
-            this.$message.error(this.$t('W_051', {
+            this.$Message.warning(this.$t('W_051', {
               'param1': this.$t('sequence') + (i + 1) + this.$t('rowNo') + this.$t('discountStandard'),
               'param2': this.$config.maxDiscount
             }))
@@ -1317,7 +1317,7 @@ export default {
           }
           //校验标准价折扣是否超过范围
           if (table[i]['discountPromotion'] && parseFloat(table[i]['discountPromotion']) > this.$config.maxDiscount) {
-            this.$message.error(this.$t('W_051', {
+            this.$Message.warning(this.$t('W_051', {
               'param1': this.$t('sequence') + (i + 1) + this.$t('rowNo') + this.$t('discountPromotion'),
               'param2': this.$config.maxDiscount
             }))
@@ -1325,7 +1325,7 @@ export default {
           }
           // // 如果赠品标识没有勾上,但是单价为0的,要提示
           // if(!table[i].cpFlgGift && (!table[i].priceSale || table[i].priceSale == 0)){
-          //   this.$message.error(this.$t('W_082', {'param': this.$t('sequence') + (i + 1) + this.$t('rowNo') }))
+          //   this.$Message.warning(this.$t('W_082', {'param': this.$t('sequence') + (i + 1) + this.$t('rowNo') }))
           //   resolve(false);
           // }
         }

+ 18 - 18
src/view/sale/order/index.vue

@@ -652,18 +652,18 @@ export default {
     openValidData(name) {
       if (this.$config.routeUrl.order.edit.key === name) {        // 编辑校验
         if (this.$refs['table-select'].batchRows[0].apvResult === '审-审中') {
-          this.$Message.error(this.$t('W_070'))
+          this.$Message.warning(this.$t('W_070'))
           return false;
         }
       } else if (this.$config.routeUrl.order.returnAndExchangeGoods.key === name) {  // 退换补校验
         // 判断状态是否可以进行退换补(只有成交状态才会进行退换补)
         let row = this.$refs['table-select'].batchRows[0];
         if (row['orderStatus'] !== this.$config.orderStatus.done) {
-          this.$message.error(this.$t('W_050', {'param': this.$v(name)}))
+          this.$Message.warning(this.$t('W_050', {'param': this.$v(name)}))
           return false;
         }
         if (row['apvResult'] !== this.$config.apvResultStatus.adopt) {
-          this.$Message.error(this.$t('W_081'))
+          this.$Message.warning(this.$t('W_081'))
           return false;
         }
       } else if (this.$config.routeUrl.order.saleReturn.key === name) {  // 销售退货校验
@@ -672,7 +672,7 @@ export default {
         if (row['outStatus'] !== this.$config.outStatus.part &&
           row['outStatus'] !== this.$config.outStatus.allOut
           || row.orderStatus == this.$config.orderStatus.reverse) {
-          this.$message.error(this.$t('W_050', {'param': this.$v(name)}))
+          this.$Message.warning(this.$t('W_050', {'param': this.$v(name)}))
           return false;
         }
         // 查询是否还有可以进行退货的明细
@@ -690,45 +690,45 @@ export default {
         if (!table || table.length == 0) {
           // 查看子级是否用退货的明细
           if (this.tableDataDetail_goodsDetail)
-            this.$message.error(this.$t('W_050', {'param': this.$v('saleReturn')}))
+            this.$Message.warning(this.$t('W_050', {'param': this.$v('saleReturn')}))
           return false;
         }
       } else if (this.$config.routeUrl.order.saleReturnReverse.key === name) {  // 销售退货冲正
         // 没有做销售退货的不能进行销售退货冲正
         let row = this.$refs['table-select'].batchRows[0];
         if (row.orderStatus == this.$config.orderStatus.reverse) {
-          this.$message.error(this.$t('W_050', {'param': this.$v(name)}))
+          this.$Message.warning(this.$t('W_050', {'param': this.$v(name)}))
           return false;
         }
       } else if (this.$config.routeUrl.order.saleRefund.key === name) {  // 销售退款
         let row = this.$refs['table-select'].batchRows[0];
         if (row['orderStatus'] != this.$config.orderStatus.done || row.apvResult != this.$config.approvalStatus.done) {
-          this.$message.error(this.$t('W_050', {'param': this.$v(name)}))
+          this.$Message.warning(this.$t('W_050', {'param': this.$v(name)}))
           return false;
         }
       } else if (this.$config.routeUrl.order.revert.key === name) {  // 冲正
         // 如果做过跟单,就不允许冲正
         let row = this.$refs['table-select'].batchRows[0];
         if (row && row.bomItems && row.bomItems.length > 0) {
-          this.$Message.error(this.$t('W_060'))
+          this.$Message.warning(this.$t('W_060'))
           return false;
         }
         //出库中商品不能进行冲正
         if (row && row.outStatus != this.$config.outStatus.noOut) {
-          this.$Message.error(this.$t('W_059'))
+          this.$Message.warning(this.$t('W_059'))
           return false;
         }
         //审批中不允许冲正,冲正状态不允许冲正
         if (row && (row.apvResult == this.$config.approvalStatus.auditing ||
           row.orderStatus == this.$config.orderStatus.reverse)) {
-          this.$Message.error(this.$t('W_086'))
+          this.$Message.warning(this.$t('W_086'))
           return false;
         }
       } else if (this.$config.routeUrl.order.deposit.key === name) {  // 定金
         let batchRow = this.$refs['table-select'].batchRows[0];
         if (batchRow.apvResult != this.$config.approvalStatus.done
           || batchRow.orderStatus == this.$config.orderStatus.reverse) {
-          this.$Message.error(this.$t('W_084'))
+          this.$Message.warning(this.$t('W_084'))
           return
         }
       }
@@ -822,7 +822,7 @@ export default {
         this.$router.push('/sale/order/sale-return-detail?returnId=' + row.orderId)
       } else {
         if (row.apvResult === '审-审中') {
-          this.$Message.error(this.$t('W_070'))
+          this.$Message.warning(this.$t('W_070'))
           return
         }
         this.$router.push('/sale/order/edit/' + row.orderId)
@@ -881,7 +881,7 @@ export default {
               if (res.code === 200) {
                 this.tableDataDetail_returnDetail = res.data.orderItem;
               } else {
-                this.$message.error(res.message)
+                this.$Message.warning(res.message)
               }
             })
           } else if (this.orderType == this.$config.orderType.refund) {
@@ -893,7 +893,7 @@ export default {
               if (res.code === 200) {
                 this.tableDataDetail_refundDetail = res.data.orderItem;
               } else {
-                this.$message.error(res.message)
+                this.$Message.warning(res.message)
               }
             })
           } else {
@@ -906,7 +906,7 @@ export default {
                 this.tableDataDetail_goodsDetail = res.data.orderItem;
                 this.tableDataDetail_collectionDetail = res.data.recepit;
               } else {
-                this.$message.error(res.message)
+                this.$Message.warning(res.message)
               }
             })
           }
@@ -929,7 +929,7 @@ export default {
           this.searchData()   // 查询一览界面
           this.$Message.success(this.$t('I_001', {'param': this.$v('edit')}))
         } else {
-          this.$message.error(res.message)
+          this.$Message.warning(res.message)
         }
       })
     },
@@ -940,7 +940,7 @@ export default {
      */
     printOrder() {
       if (this.$refs['table-select'].batchKeys.length !== 1) {
-        this.$Message.error(this.$t('W_013'))
+        this.$Message.warning(this.$t('W_013'))
         return
       }
       this.$refs['print-btn'].openChooseTemplate()
@@ -983,7 +983,7 @@ export default {
             this.$refs['print-btn'].print(row)
           }
         } else {
-          this.$message.error(res.message)
+          this.$Message.warning(res.message)
         }
       })
     },

+ 11 - 11
src/view/sale/order/return-and-exchange.vue

@@ -915,7 +915,7 @@
               this.formData.defWhId = res.data[0].defWhId
             }
           } else {
-            this.$message.error(res.message)
+            this.$Message.warning(res.message)
           }
         })
       },
@@ -1267,7 +1267,7 @@
         if (response.code == 200) {
           this.formData.files.push(response.data)
         } else {
-          this.$Message.error(response.message)
+          this.$Message.warning(response.message)
         }
       },
       /**
@@ -1393,19 +1393,19 @@
           // 明细必须有数据
           let table = this.getTableChangeData();
           if (!table || table.length === 0) {
-            this.$message.error(this.$t('W_039'))
+            this.$Message.warning(this.$t('W_039'))
             resolve(false);
           }
           for (let i = 0; i < table.length; i++) {
             //如果是新建的数据,数量必须大于0
             if (!table[i]['itemId'] && table[i]['skuId']
               && (!table[i]['tItemQuantity'] || table[i]['tItemQuantity'] == 0)) {
-              this.$message.error(this.$t('W_009', {'param1': this.$t('itemQuantity'), 'param2': 0}))
+              this.$Message.warning(this.$t('W_009', {'param1': this.$t('itemQuantity'), 'param2': 0}))
               resolve(false);
             }
             // // 如果赠品标识没有勾上,但是单价为0的,要提示
             // if(!table[i].cpFlgGift && (!table[i].priceSale || table[i].priceSale == 0)){
-            //   this.$message.error(this.$t('W_082', {'param': this.$t('sequence') + (i + 1) + this.$t('rowNo') }))
+            //   this.$Message.warning(this.$t('W_082', {'param': this.$t('sequence') + (i + 1) + this.$t('rowNo') }))
             //   resolve(false);
             // }
             if (table[i].bomItems && table[i].bomItems.length > 0) {
@@ -1413,7 +1413,7 @@
                 // 退货数据不允许大于 可退量(实际订单数量-出库数量-出库中数量)
                 if (row['itemId'] && row['skuId']
                   && (parseFloat(row['tItemQuantity']) - parseFloat(row['tItemQuantityOriginal']) + parseFloat(row['canReturnQuantity']) < 0)) {
-                  this.$message.error(this.$t('W_009', {
+                  this.$Message.warning(this.$t('W_009', {
                     'param1': this.$t('itemQuantity'),
                     'param2': this.$t('canReturnQuantity')
                   }))
@@ -1458,7 +1458,7 @@
               //跳转到订单一览界面
               this.$router.push('/sale/order/index');
             } else {
-              this.$Message.error(res.message)
+              this.$Message.warning(res.message)
             }
             this.loading = false
           })
@@ -1756,7 +1756,7 @@
             this.setEntityByEdit(res.data.list[0])
             this.loading = false
           } else {
-            this.$Message.error(res.message)
+            this.$Message.warning(res.message)
             this.loading = false
           }
         })
@@ -1988,7 +1988,7 @@
           if (res.code === 200) {
             this.customerFromList = res.data.list
           } else {
-            this.$message.error(res.message)
+            this.$Message.warning(res.message)
           }
           this.loading = false
         })
@@ -2003,7 +2003,7 @@
           if (res.code === 200) {
             this.tolietsList = res.data.list
           } else {
-            this.$message.error(res.message)
+            this.$Message.warning(res.message)
           }
           this.loading = false
         })
@@ -2038,7 +2038,7 @@
             this.customerType = res.data.list.filter(f => f.itemCode == this.$config.dictionaryItemCode.customerType)
             this.houseType = res.data.list.filter(f => f.itemCode == this.$config.dictionaryItemCode.customerHouseType)
           } else {
-            this.$Message.error(res.message)
+            this.$Message.warning(res.message)
           }
         })
       },

+ 2 - 2
src/view/sale/order/sale-refund-detail.vue

@@ -272,7 +272,7 @@ export default {
       if (response.code == 200) {
         this.formData.files.push(response.data)
       } else {
-        this.$Message.error(response.message)
+        this.$Message.warning(response.message)
       }
     },
     /**
@@ -395,7 +395,7 @@ export default {
               //跳转到订单一览界面
               this.$router.push('/sale/order/index');
             } else {
-              this.$Message.error(res.message)
+              this.$Message.warning(res.message)
             }
             this.loading = false
           })

+ 7 - 7
src/view/sale/order/sale-refund.vue

@@ -838,7 +838,7 @@ export default {
       if (response.code == 200) {
         this.formData.files.push(response.data)
       } else {
-        this.$Message.error(response.message)
+        this.$Message.warning(response.message)
       }
     },
     /**
@@ -983,7 +983,7 @@ export default {
       return new Promise(resolve => {
         // 退款金额必须要填写
         if (!this.feeFormData.sumRefundAmount || this.feeFormData.sumRefundAmount == 0) {
-          this.$message.error(this.$t('W_042', {'param': this.$t('sumRefundAmount')}))
+          this.$Message.warning(this.$t('W_042', {'param': this.$t('sumRefundAmount')}))
           this.$refs.sumRefundAmount.$refs.inputNumber.$refs.input.focus();
           resolve(false);
         }
@@ -993,7 +993,7 @@ export default {
           if(table && table.length > 0){
             table.forEach((it,index)=>{
               if(!it.settlementType && it.refundAmount){
-                this.$message.error(this.$t('W_089', {'param1': (index + 1),'param2': this.$t('settlementTypeName')}))
+                this.$Message.warning(this.$t('W_089', {'param1': (index + 1),'param2': this.$t('settlementTypeName')}))
                 resolve(false);
               }
             })
@@ -1003,7 +1003,7 @@ export default {
           if(table && table.length > 0){
             table.forEach((it,index)=>{
               if(!it.settlementType && it.refundAmount){
-                this.$message.error(this.$t('W_089', {'param1': (index + 1),'param2': this.$t('settlementTypeName')}))
+                this.$Message.warning(this.$t('W_089', {'param1': (index + 1),'param2': this.$t('settlementTypeName')}))
                 resolve(false);
               }
             })
@@ -1012,7 +1012,7 @@ export default {
           if(table && table.length > 0){
             table.forEach((it,index)=>{
               if(!it.settlementType && it.refundAmount){
-                this.$message.error(this.$t('W_089', {'param1': (index + 1),'param2': this.$t('settlementTypeName')}))
+                this.$Message.warning(this.$t('W_089', {'param1': (index + 1),'param2': this.$t('settlementTypeName')}))
                 resolve(false);
               }
             })
@@ -1059,7 +1059,7 @@ export default {
               //跳转到订单一览界面
               this.$router.push('/sale/order/index');
             } else {
-              this.$Message.error(res.message)
+              this.$Message.warning(res.message)
             }
             this.loading = false
           })
@@ -1313,7 +1313,7 @@ export default {
             this.resizeTableHeight();
             this.loading = false
           } else {
-            // this.$Message.error(res.message)
+            // this.$Message.warning(res.message)
             this.loading = false
           }
         })

+ 1 - 1
src/view/sale/order/sale-return-detail.vue

@@ -407,7 +407,7 @@ export default {
           this.$emit('on-detail', res.data.list[0])
           this.loading = false
         } else {
-          this.$Message.error(res.message)
+          this.$Message.warning(res.message)
           this.loading = false
         }
       })

+ 4 - 4
src/view/sale/order/sale-return-reverse.vue

@@ -122,7 +122,7 @@ export default {
     reverse(){
       let batchKeys = this.$refs['table-select'].batchKeys;
       if(!batchKeys || batchKeys.length == 0){
-        this.$Message.error(this.$t('W_013'))
+        this.$Message.warning(this.$t('W_013'))
         return;
       }
       let params = {}
@@ -136,7 +136,7 @@ export default {
           this.detail(this.$route.query.orderId);
           this.$Message.success(this.$t('I_001', { 'param': this.$v('add') }))
         } else {
-          this.$Message.error(res.message)
+          this.$Message.warning(res.message)
         }
         this.loading = false
       })
@@ -178,7 +178,7 @@ export default {
           this.tableDataDetail = res.data.list
           this.loading = false
         } else {
-          // this.$Message.error(res.message)
+          // this.$Message.warning(res.message)
           this.loading = false
         }
       })
@@ -205,7 +205,7 @@ export default {
           }
           this.loading = false
         } else {
-          // this.$Message.error(res.message)
+          // this.$Message.warning(res.message)
           this.loading = false
         }
       })

+ 8 - 8
src/view/sale/order/sale-return.vue

@@ -1288,7 +1288,7 @@
         if (response.code == 200) {
           this.formData.files.push(response.data)
         } else {
-          this.$Message.error(response.message)
+          this.$Message.warning(response.message)
         }
       },
       /**
@@ -1401,7 +1401,7 @@
           let table = this.$refs['goodsTable'].getTableData();
           table = table.filter(it => it.rejectQuantity != null && it.rejectQuantity != 0);
           if (!table || table.length === 0) {
-            this.$message.error(this.$t('W_042', {'param': this.$t('nowRejectQuantity')}))
+            this.$Message.warning(this.$t('W_042', {'param': this.$t('nowRejectQuantity')}))
             resolve(false) ;
           }
           for (let i = 0; i < table.length; i++) {
@@ -1412,7 +1412,7 @@
             }
             //如果是新建的数据,数量必须大于0
             if (canReturnQuantity + parseFloat(table[i]['rejectQuantity']) < 0) {
-              this.$message.error(this.$t('W_009', {
+              this.$Message.warning(this.$t('W_009', {
                 'param1': '【' + this.$t('sequence') + (i + 1) + this.$t('rowNo') + '】' + this.$t('rejectQuantity'),
                 'param2': this.$t('canReturnQuantity')
               }))
@@ -1461,7 +1461,7 @@
                 //跳转到订单一览界面
                 this.$router.push('/sale/order/index');
               } else {
-                this.$Message.error(res.message)
+                this.$Message.warning(res.message)
               }
               this.loading = false
             })
@@ -1644,7 +1644,7 @@
             this.setEntityByEdit(res.data.list[0])
             this.loading = false
           } else {
-            this.$Message.error(res.message)
+            this.$Message.warning(res.message)
             this.loading = false
           }
         })
@@ -1849,7 +1849,7 @@
           if (res.code === 200) {
             this.customerFromList = res.data.list
           } else {
-            this.$message.error(res.message)
+            this.$Message.warning(res.message)
           }
           this.loading = false
         })
@@ -1864,7 +1864,7 @@
           if (res.code === 200) {
             this.tolietsList = res.data.list
           } else {
-            this.$message.error(res.message)
+            this.$Message.warning(res.message)
           }
           this.loading = false
         })
@@ -1899,7 +1899,7 @@
             this.customerType = res.data.list.filter(f => f.itemCode == this.$config.dictionaryItemCode.customerType)
             this.houseType = res.data.list.filter(f => f.itemCode == this.$config.dictionaryItemCode.customerHouseType)
           } else {
-            this.$Message.error(res.message)
+            this.$Message.warning(res.message)
           }
         })
       },

Některé soubory nejsou zobrazeny, neboť je v těchto rozdílových datech změněno mnoho souborů