Merge branch 'master' of http://git.dongkesoft.com:9001/DK-MES-3.0/mes-web

# Conflicts:
#	src/locale/lang/zh-CN.js

src/locale/lang/zh-CN.js

@@ -1121,7 +1121,8 @@ export const messages = {
   W_149: '分组至少需要2条数据',
   W_150: '至少选择1条数据进行撤销',
   W_151: '该条数据不可以进行撤销条码操作',
-  W_152: '至少选择1条数据',
+  W_153: '至少选择1条数据',
+  W_152: '载具最大装载数，0为无限制',
   E_001: '系统出现异常，请联系管理员。',
   Q_001: '当前页面的数据有过更改，请确认需要保存吗？',
   Q_002: '确定要进行{param}操作吗？',

src/view/mst/model/index.vue

@@ -124,10 +124,8 @@
                     v-if="this.formType==$config.formCode.modelCarrier">
           <InputNumberPop v-model="formData.limitLoadQty" :min=0 :clearable="false"/>
         </DkFormItem>
-
-        <!--   区域内唯一    -->
-        <DkFormItem prop="flgRangeOnly" :required=false v-if="this.formType==$config.formCode.modelCarrier">
-          <DkSwitch v-model="formData.flgRangeOnly" :clearable="false"></DkSwitch>
+        <DkFormItem v-if="this.formType==$config.formCode.modelCarrier">
+          <span style="line-height: 20px;">{{$t('W_152')}}</span>
         </DkFormItem>
 
         <!--   标准次数     -->
@@ -161,6 +159,10 @@
           <InputPop v-model="formData.remarks" textareaFlag/>
         </DkFormItem>
 
+        <!--   区域内唯一    -->
+        <DkFormItem prop="flgRangeOnly" :required=false v-if="this.formType==$config.formCode.modelCarrier">
+          <DkSwitch v-model="formData.flgRangeOnly" :clearable="false"></DkSwitch>
+        </DkFormItem>
       </DkForm>
 
       <!--      产出型号-->

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

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

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

@@ -320,7 +320,7 @@
         }
         let arr = this.$refs['detail-table-select'].$refs.table.getCheckboxRecords()
         if(arr.length==0){
-          this.$Message.error(this.$t('W_152'))
+          this.$Message.error(this.$t('W_153'))
           return false
         }
         return true

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

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