修改部分国际化

src/api/pages/pdm-server/collect.js

@@ -46,7 +46,11 @@ export default {
     //通过条码查询
     getProductByCode: '/get_product_by_code',
     //通过条码或载具查询产品
-    selectByCodeOrCarrier: '/get_product_by_code_or_carrier'
+    selectByCodeOrCarrier: '/get_product_by_code_or_carrier',
+    //修改成型产品型号
+    updateProductModel:'update_product_model',
+    //修改商标或釉色
+    updateLogoOrColour: 'update_logo_or_colour',
   }
 }
 export const routeUrl = {

src/api/pages/pdm/prod-code-change.js

@@ -8,8 +8,6 @@ export default {
     prefix:'/mdm-server/pdm/productCode/',
     //产品型号变更一览查询（分页）
     getProductColourLogoByBarcode:'get_product_colour_logo_by_barcode',
-    //修改成型产品型号
-    updateProductModel:'update_product_model',
   }
 }
 

src/api/pages/pdm/product-colour-logo.js

@@ -8,8 +8,6 @@ export default {
     prefix: '/mdm-server/pdm/productCode/',
     //商标釉色一览查询（分页）
     getProductColourLogoByBarcode: 'get_product_colour_logo_by_barcode',
-    //修改商标或釉色
-    updateLogoOrColour: 'update_logo_or_colour',
   }
 }
 

src/components/base/select-pop/setting.js

@@ -333,6 +333,15 @@ const data = {
       defectKind: Config.defectKind.Damage
     }
   },
+  //开模损原因
+  productDefectMoldDamage: {
+    methodsName: 'getProductDefect',
+    labelKeyData:'defectName',
+    valueKeyData:'defectId',
+    cond: {
+      defectKind: Config.defectKind.moldDamageReason
+    }
+  },
   //工单类型
   sheetType: {
     service: 'sheetTypeSettingService',
@@ -399,6 +408,15 @@ const data = {
     labelKeyData:'modelName',
     valueKeyData:'modelId',
   },
+  //产阶类型
+  nodeType: {
+    methodsName: 'getDataKind',
+    labelKeyData:'kindName',
+    valueKeyData:'kindCode',
+    cond: {
+      kindType: Config.dataKind.nodeType
+    }
+  },
 }
 
 

src/config/index.js

@@ -895,6 +895,8 @@ export default {
     motherMold:{model: 'mst', table: 't_mother_mould'},
     //省市区
     area:{model: 'mst', table: 't_area'},
+    // erp节点
+    erpNode: {model: 'mst', table: 't_erp_node'},
   },
 
   /**
@@ -2009,6 +2011,7 @@ export default {
     area:'区域种类',
     itemKind: '品检项类',
     inspValueKind: '品检取值',
+    nodeType: '产阶类型',
   },
 
   /**

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

@@ -78,7 +78,11 @@
                   <vxe-option v-for="item in row.valueFormat.items" :key="item.key"
                               :value="item.key" :label="item.value"></vxe-option>
                 </vxe-select>
-
+                <vxe-select transfer v-if="row.valueKind == 'M-CHOICE'" v-model="row.settingValue" multiple
+                            size="mini" @change="changeOption($event,row)" :disabled="!row.flgModifiable">
+                  <vxe-option v-for="item in row.valueFormat.items" :key="item.key"
+                              :value="item.key" :label="item.value"></vxe-option>
+                </vxe-select>
                 <!--                小数-->
                 <vxe-input v-if="row.valueKind == 'NUM'" size="mini"
                            @blur="blursSettingValue(row)"

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

@@ -42,10 +42,10 @@
         <DkForm slot="content" ref="formInline" v-model="formData" style="width: 95%" :label-max-words="5">
           <!--损坯原因-->
           <DkFormItem prop="scrapReasonId">
-            <SelectPop v-model="formData.scrapReasonId" :multiple="false" :options="scrapReasonList" ref="scrapReason"
-                       labelKey="defectName"
-                       valueKey="defectId"
-                       @on-select="selectScrapReason">
+            <SelectPop v-model="formData.scrapReasonId" :multiple="false" ref="scrapReason"
+                       @on-select="selectScrapReason"
+                       pop-type="productDefectMoldDamage"
+            >
             </SelectPop>
           </DkFormItem>
           <div style="padding-top:2px;" v-if="formData.scrapReasonId">

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

@@ -1097,6 +1097,7 @@ export default {
               it.scrapDate = null
               it.moldingDate = this.formData.moldingDate
               it.outputMoldedNum = it.outputMoldedNum + it.moldingBatch - it.lastMoldingBatch
+              it.pdtModelId = it.modelId
             })
             templist.list = itemParam
           }

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

@@ -22,7 +22,7 @@
                       @on-blur="onBarCode"/>
           </DkFormItem>
           <!--产品型号-->
-          <DkFormItem prop="modelCode" :label="$t('appMoldNo')" >
+          <DkFormItem prop="modelCode" :label="$t('moldingModelCode')" >
             <InputPop ref="modelCode" v-model="formData.modelCode" :readonly="true"/>
           </DkFormItem>
           <!--注浆日期-->
@@ -125,7 +125,7 @@
           // 产品条码
           { field: 'barCode', type: 'disabled', width: 'auto' },
           //产品型号
-          { field: 'modelCode', type: 'disabled', title: self.$t('appMoldNo'), width: 'auto' },
+          { field: 'modelCode', type: 'disabled', title: self.$t('moldingModelCode'), width: 'auto' },
           // 成型日期
           { field: 'moldingDate', type: 'disabled', width: 'auto' },
           //完成时间

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

@@ -96,7 +96,7 @@
                  name="table">
           <!--          <DkTableColumn field="moldlineCode"></DkTableColumn>-->
           <!--          <DkTableColumn field="moldlineName"></DkTableColumn>-->
-          <DkTableColumn field="moldlineCodeName" :title="$t('appFormingLine')"></DkTableColumn>
+          <DkTableColumn field="moldlineCodeName" :title="$t('moldlineCodeName')"></DkTableColumn>
           <DkTableColumn field="moldingDate"></DkTableColumn>
           <DkTableColumn field="moldingBatch"></DkTableColumn>
           <DkTableColumn field="productCode" :title="$t('pdtBarcode')"></DkTableColumn>
@@ -156,7 +156,7 @@ export default {
         {
           itemCode: 'moldlineName',
           valueFormat: {code: 'moldlineId'},
-          itemName: 'appFormingLine',
+          itemName: 'moldlineCodeName',
           valueKind: self.$config.docUserInput.sSearch, //单选/多选放大镜
           magnifierType: self.$config.MagnifierType.moldlineGroup,
         },
@@ -314,7 +314,7 @@ export default {
      * @date   : 2023-04-19 13:59
      */
     saveData() {
-      return this.excute(this.$service.prodCodeChangeService, this.$service.prodCodeChangeService.updateProductModel, this.params)
+      return this.excute(this.$service.collectService, this.$service.collectService.updateProductModel, this.params)
     },
     /**
      * @desc   : 参数赋值

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

@@ -178,7 +178,7 @@
           // 产品条码
           { field: 'barCode', type: 'disabled', width: 'auto' },
           //模具编号
-          { field: 'modelCode', title: self.$t('appMoldNo'), type: 'disabled', width: 'auto' },
+          { field: 'modelCode', title: self.$t('moldingModelCode'), type: 'disabled', width: 'auto' },
           // 成型日期
           { field: 'moldingDate', type: 'disabled', width: 'auto' },
           //完成工序

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

@@ -256,7 +256,7 @@ export default {
      * @date   : 2023/2/20 14:46
      */
     saveData() {
-      return this.excute(this.$service.productColourLogoService, this.$service.productColourLogoService.updateLogoOrColour, this.params)
+      return this.excute(this.$service.collectService, this.$service.collectService.updateLogoOrColour, this.params)
     },
     /**
      * @desc   : 参数赋值