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

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

@@ -11,8 +11,12 @@
     @on-cancel="modalCancel"
     :saveFlag="true"
   >
+    <DkTabs v-model="tabValue" :options="[
+      {label: vm.$t('web'), name: 'WEB-MAIN'},
+      {label: vm.$t('app'), name: 'PDA-PROD'},
+    ]" v-if="parentData.filter(f => f.appCode == 'PDA-PROD').length" ></DkTabs>
     <div style="height: 600px;overflow:auto">
-      <div class="main-class">
+        <div class="main-class">
         <!--    <Collapse>-->
         <!--      <Panel v-for="(it,index) in model" :key="index" :name="it.funcId.toString()">-->
         <!--        {{ it.funcName }}-->
@@ -37,10 +41,6 @@
         <!--        </div>-->
         <!--      </Panel>-->
         <!--    </Collapse>-->
-        <DkTabs v-model="tabValue" :options="[
-      {label: vm.$t('web'), name: 'WEB-MAIN'},
-      {label: vm.$t('app'), name: 'PDA-PROD'},
-    ]" v-if="parentData.filter(f => f.appCode == 'PDA-PROD').length"></DkTabs>
         <el-collapse v-model="model" @change="handleChange(null)">
           <dk-el-collapse-item v-for="(it,index) in parentData.filter(f => f.appCode == tabValue)" :key="index" :title="it[name]" :name="it.id"
                                :ref="'collapseItem_' + it.id" :id="it.id" :checked="it.checked"

src/components/business/print/template.vue

@@ -139,10 +139,15 @@
               <img :src="scanCode" style="width: 100%;height: 100%;"/>
               {{dataSource.main.filter(f=>f.key==item.dataSourceKey)[0]?.value}}
             </div>
-            <div v-if="item.name == '$barCode'">
-              <svg class="icon" aria-hidden="true">
-                <use xlink:href="#icon-tiaoxingma"></use>
-              </svg>
+            <div v-if="item.name == '$barCode'" style="width: 100%;height: 100%;">
+              <img :src="barCode" style="width: 100%;height: 100%;"/>
+<!--              :style="'width: '+item.width+';height: '+item.height+';'"-->
+<!--              <svg class="icon" aria-hidden="true"-->
+<!--                   width="100%" height="100%;"-->
+<!--                   :viewBox="'0 0 '+item.width+' '+item.height+';'"-->
+<!--                   preserveAspectRatio="none meet">-->
+<!--                <use xlink:href="#icon-tiaoxingma"></use>-->
+<!--              </svg>-->
               {{dataSource.main.filter(f=>f.key==item.dataSourceKey)[0]?.value}}
             </div>
           </vue-drag-resize>
@@ -625,6 +630,7 @@ import Ruler from '_c/sub/ruler'
 import './template.less'
 import img from '@/assets/images/img.png'
 import scanCode from '@/assets/images/code.png'
+import barCode from '@/assets/images/barcode.jpg'
 import data from '@/assets/images/data.png'
 import table from '@/assets/images/table.png'
 import t from '@/assets/images/ttf.png'
@@ -691,6 +697,7 @@ export default {
       data,
       table,
       scanCode,
+      barCode,
       t,
       itemTemplate: {
         text: '文本',
@@ -1546,7 +1553,7 @@ export default {
           let barCodeInfo = {
             active: false,
             width: 80,
-            height: 20,
+            height: 40,
             path: '',
             name: '$barCode',
             top: e.offsetY - 32 <= 0 ? 0 : e.offsetY - 32,

src/locale/lang/zh-CN.js

@@ -1155,7 +1155,7 @@ export const messages = {
   W_152: '载具最大装载数，0为无限制',
   W_153: '修改后次数只影响后续新建的此型号模具',
   W_154: '至少选择1条数据',
-  W_155: '起始模具号+模具数量要小于等于1000',
+  W_155: '起始模具号+模具数量要小于1000',
   W_156: '修改后次数只影响后续新建的此型号模具',
   W_157: '明细列表中请选择相同的工序进行操作',
   W_158: '未选择主体标识，请选择后重新操作',

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

@@ -20,11 +20,11 @@
         <DkForm slot="content" ref="formInline" v-model="formData" style="width: 92%" :label-max-words="4">
           <!--起始序号-->
           <DkFormItem prop="startNo" :required="true" :data-type="$config.dataType.number">
-            <InputNumberPop v-model="formData.startNo" :digits=0 :min="1"/>
+            <InputNumberPop v-model="formData.startNo" :digits=0 :min="1" :max="1000"/>
           </DkFormItem>
           <!--窑车数量-->
           <DkFormItem prop="carCount" :required="true" :data-type="$config.dataType.number">
-            <InputNumberPop v-model="formData.carCount" :digits=0 :min="1"/>
+            <InputNumberPop v-model="formData.carCount" :digits=0 :min="1" :max="1000"/>
           </DkFormItem>
           <div style="padding-top:2px;">
             <DkButton type="primary" ref="confirm" size="small" @click="bindCar">{{ '设置窑车' }}</DkButton>

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

@@ -75,7 +75,7 @@
                          valueKey="colourId">
               </SelectPop>
             </DkFormItem>
-              <DkButton @click="mergeLogoColour">{{$v('confirm')}}</DkButton>
+              <DkButton @click="mergeLogoColour" style="position: relative; bottom: 2px">{{$v('confirm')}}</DkButton>
           </DkForm>
           <EditTable ref="editTableErp" name="table"
                      :major-field="'itemId'"
@@ -89,6 +89,7 @@
                      @addRow="erpAddRow"
                      @delRow="deleteModelPdtErp"
                      @chooseData="chooseLogoColour"
+                     @changeValue="changeErp"
           ></EditTable>
         </div>
       </DkPanel>
@@ -315,6 +316,9 @@ export default {
         this.$set(this.formData.erpList[this.erpIndex], 'bomList', editTableBom)
         this.$set(this.formData.erpList[this.erpIndex], 'labelList', editTableLabel)
       }
+      if (this.formData.erpList[rowIndex + 1]) {
+        this.formData.erpList[rowIndex + 1].flgDefault = false
+      }
     },
     /**
      * @desc   : erp表格行切换
@@ -796,6 +800,25 @@ export default {
     chooseLogoColour (row, rowIndex) {
       this.formData.erpList[rowIndex].logoColourId = row.logoId + '-' + row.colourId
     },
+    /**
+     * @desc   : erp表格改变数据
+     * @author : 洪旭东
+     * @date   : 2023-05-17 14:17
+     */
+    changeErp(field, row, rowIndex) {
+      //修改默认等级
+      if (field === 'flgDefault'){
+        if (row.flgDefault) {
+          for (let i = 0; i < this.formData.erpList.length; i++) {
+            if (i != rowIndex) {
+              this.formData.erpList[i].flgDefault = false
+            }
+          }
+        } else {
+          this.formData.erpList[rowIndex].flgDefault = true
+        }
+      }
+    }
     // endregion
 
   },

src/view/mst/model/index.vue

@@ -120,7 +120,7 @@
         <!--   限制装载量    -->
         <DkFormItem prop="limitLoadQty" :required="true" :data-type="$config.dataType.number"
                     v-if="this.formType==$config.formCode.modelCarrier">
-          <InputNumberPop v-model="formData.limitLoadQty" :min=0 :clearable="false"/>
+          <InputNumberPop v-model="formData.limitLoadQty" :min=0 :clearable="false" style="width: calc(100% - 16px);"/>
         </DkFormItem>
         <DkFormItem v-if="this.formType==$config.formCode.modelCarrier">
           <span style="line-height: 20px;">{{$t('W_152')}}</span>

src/view/mst/molding/form.vue

@@ -688,6 +688,9 @@
        * @date   : 2023-02-14 10:26
        */
       canDeleteItem(row, colItem) {
+        if (this.type === this.$config.formMode.install) {
+          return false
+        }
         return true
       },
       /**

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

@@ -57,28 +57,28 @@
         <!--   缺陷代码     -->
         <DkFormItem
           v-if="this.formType === this.$config.formCode.productDefect || this.formType === this.$config.formCode.moldDamageReason "
-          prop="defectCode" :required="true">
-          <InputPop v-model="formData.defectCode" ref="defectCode"/>
+          prop="defectCode" :required="true" :label="$t('reasonCode')">
+          <InputPop v-model="formData.defectCode" ref="defectCode" />
         </DkFormItem>
         <!--    缺陷名称    -->
         <DkFormItem
           v-if="this.formType === this.$config.formCode.productDefect  || this.formType === this.$config.formCode.moldDamageReason "
-          prop="defectName" :required="true">
-          <InputPop v-model="formData.defectName" ref="defectName"/>
+          prop="defectName" :required="true" :label="$t('reasonName')">
+          <InputPop v-model="formData.defectName" ref="defectName" />
         </DkFormItem>
         <!--   损坯代码     -->
-        <DkFormItem :label="$t('damageCode')" v-if="this.formType === this.$config.formCode.productDamage"
+        <DkFormItem :label="$t('reasonCode')" v-if="this.formType === this.$config.formCode.productDamage"
                     prop="defectCode" :required="true">
           <InputPop v-model="formData.defectCode" ref="defectCode"/>
         </DkFormItem>
         <!--    损坯名称    -->
-        <DkFormItem :label="$t('damageName')" v-if="this.formType === this.$config.formCode.productDamage"
+        <DkFormItem :label="$t('reasonName')" v-if="this.formType === this.$config.formCode.productDamage"
                     prop="defectName" :required="true">
           <InputPop v-model="formData.defectName" ref="defectName"/>
         </DkFormItem>
         <!--    缺陷分类    -->
         <DkFormItem prop="defectTypes" :required="false"
-                    :data-type="this.$config.dataType.array">
+                    :data-type="this.$config.dataType.array" :label="$t('reasonType')">
           <SelectPop v-model="formData.defectTypes" ref="defectTypes" multiple
                      :options="defectTypesList"
                      :show-toolbar="true"
@@ -142,9 +142,11 @@ export default {
       searchContent: [
         {
           itemCode: 'defectCode',
+          itemName: 'reasonCode',
         },
         {
           itemCode: 'defectName',
+          itemName: 'reasonName',
         },
         self.$config.flgValidSearch //有效标识
       ]

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

@@ -158,10 +158,10 @@
           }
           this.excute(this.$service.collectService, this.$service.collectService.checkCarCode, params).then(res => {
             if (res.code === this.$config.SUCCESS_CODE) {
-              //窑车位置
-              this.getKilnCarPlace()
               this.formData.kilnId = res.data.carrier.kilnId
               this.formData.carModelId = res.data.carrier.modelId
+              //窑车位置
+              this.getKilnCarPlace()
               if(res.data.productList && res.data.productList.length>0){
                 this.tableData = res.data.productList
                 for(let it of this.tableData){
@@ -301,6 +301,7 @@
        *   @author : 寇珊珊
        */
       saveData() {
+        console.log("WWWW111115",this.params)
         return this.excute(this.$service.collectService, '/', this.params)
       },
       /**

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

@@ -35,7 +35,7 @@
           <!-- 窑炉编码 -->
           <DkTableColumn field="kilnCode" width="200px" ></DkTableColumn>
           <!-- 窑车编码 -->
-          <DkTableColumn field="carNo" :title="$t('carCode')"></DkTableColumn>
+          <DkTableColumn field="carCode" :title="$t('carCode')"></DkTableColumn>
           <!-- 当前工序 -->
           <DkTableColumn field="currentNode"></DkTableColumn>
           <!-- 最大产品数量 -->
@@ -190,9 +190,6 @@ export default {
          if (res.code === this.$config.SUCCESS_CODE) {
           this.tableData =res.data.list
            this.loading = false
-           for(let i  of  this.tableData){
-             i.carNo= i.kilnCode+'-'+i.carNo
-           }
          }
        })
       return excute