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

src/components-app/base/dk-app-nav-bar/dk-app-nav-bar.vue

@@ -102,7 +102,16 @@ export default {
     //跳转
     toApp(item) {
       this.showPopover = false
-      this.$router.push({ name: item.toRouter })
+      if (item.toRouter) {
+        this.$router.push({ name: item.toRouter })
+      }
+      if(item.type === 1){
+          //点击事件
+          this.$emit('toApp',{
+            item:item
+          })
+      }
+
     }
   }
 

src/components/base/dk-function/dk-el-collapse-item.vue

@@ -1,9 +1,13 @@
 <!-- @desc:el-collapse-item的扩展，为了加上checkbox  @auth:周兴  @time:2022/12/29 14:40 -->
 <template>
-  <div >
+  <div>
     <el-collapse-item :title="title" :name="name" ref="collapseItem">
       <template slot="title">
-        {{ title + '\u3000'   }} <div @click.stop><Checkbox v-model="checkedData" @on-change="handleChange" :disabled="disabled"></Checkbox></div>
+        {{ title + '\u3000' }}
+        <div @click.stop>
+          <Checkbox style="margin-bottom: 0 !important;" v-model="checkedData" @on-change="handleChange"
+                    :disabled="disabled"></Checkbox>
+        </div>
       </template>
       <slot></slot>
     </el-collapse-item>
@@ -23,13 +27,13 @@ export default {
     id: {
       type: [String, Number],
     },
-    checked:{
-      type:Boolean,
-      default:false
+    checked: {
+      type: Boolean,
+      default: false
     },
-    childFlag:{
-      type:Boolean,
-      default:false
+    childFlag: {
+      type: Boolean,
+      default: false
     },
     disabled: {
       type: Boolean,
@@ -37,14 +41,14 @@ export default {
     }
   },
   watch: {
-    checked(n,o){
+    checked(n, o) {
       this.checkedData = n;
       this.handleChange(n);
     }
   },
   data() {
     return {
-      checkedData :false,
+      checkedData: false,
     }
   },
   methods: {
@@ -53,8 +57,8 @@ export default {
      * @author : 周兴
      * @date   : 2022/12/29 16:50
      */
-    handleChange(e){
-      this.$emit('on-change',e,this.id)
+    handleChange(e) {
+      this.$emit('on-change', e, this.id)
     },
   },
   mounted() {

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/base/dk-function/master-slave-checkbox.vue

@@ -2,12 +2,14 @@
 <template>
   <div class="out-div">
     <div class="item-div">
-      <div>
-        <Checkbox v-model="checkedData" @on-change="changeMaster" :disabled="disabled">{{ item[name] }}</Checkbox>
+      <div style="display: flex;align-items: center;justify-content: right">
+        {{ item[name] }}
+        <Checkbox style="margin-bottom: 0 !important;padding-left: 5px;" v-model="checkedData" @on-change="changeMaster"
+                  :disabled="disabled"></Checkbox>
       </div>
       <div></div>
-      <div>
-        <div v-for="(fItCld,fIndexCld) in data" :key="fIndexCld" style="padding:5px;">
+      <div style="padding:5px;">
+        <div v-for="(fItCld,fIndexCld) in data" :key="fIndexCld" style="width: 135px;height: 26px">
           <Checkbox v-model="fItCld.checked" @on-change="changeItem" :disabled="disabled">{{
               fItCld[name]
             }}
@@ -46,7 +48,7 @@ export default {
       data: [],
       itemData: null,
       checkedData: false,
-      clickItemFlag:false,  // 是否点击子项
+      clickItemFlag: false,  // 是否点击子项
     }
   },
   watch: {
@@ -60,7 +62,7 @@ export default {
     },
     checked(n, o) {
       this.checkedData = n;
-      if(!this.clickItemFlag){
+      if (!this.clickItemFlag) {
         // 需要把对应的子级勾上
         this.data.update(this.itemData, 'id', 'checked', 'parentId')
         this.$forceUpdate()
@@ -124,7 +126,7 @@ export default {
 
 
 .item-div > div:nth-child(1) {
-  width: 20%;
+  width: 12%;
   display: flex;
   align-items: center;
   justify-content: center;
@@ -137,7 +139,7 @@ export default {
 }
 
 .item-div > div:nth-child(3) {
-  width: 78%;
+  width: 86%;
   display: flex;
   flex-wrap: wrap;
 }

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

@@ -788,14 +788,36 @@ export default {
       return false;
     },
     /**
+     * @desc   : 增加当前行hover
+     * @author : 周兴
+     * @date   : 2023/5/17 16:39
+     */
+    addHover(rowIndex){
+      if (this.operateFlag && rowIndex >= 0) {
+        // 如果行不变，不用执行
+        if (rowIndex != this.rowIndex) {
+          if (this.dataFinal && this.dataFinal.length > 0) {
+            this.dataFinal.forEach(it => {
+              this.$set(it, '_hover', false)
+            })
+          }
+        }
+        setTimeout(() => {
+          if (rowIndex >= 0 && this.dataFinal[rowIndex]) {
+            this.$set(this.dataFinal[rowIndex], '_hover', true)
+          }
+        }, 30)
+      }
+    },
+    /**
      * @desc   : 鼠标移入增加新增和删除按钮
      * @author : 周兴
      * @date   : 2022/4/19 10:56
      */
     handleCellMouseEnter({rowIndex}) {
-      if (this.operateFlag && rowIndex >= 0) {
-        this.$set(this.$refs[this.name].data[rowIndex], '_hover', true)
-      }
+      // if (this.operateFlag && rowIndex >= 0) {
+      //   this.$set(this.$refs[this.name].data[rowIndex], '_hover', true)
+      // }
     },
     /**
      * @desc   : 鼠标移出删除新增和删除按钮
@@ -803,9 +825,9 @@ export default {
      * @date   : 2022/4/19 10:56
      */
     handleCellMouseLeave({rowIndex}) {
-      if (this.operateFlag && rowIndex >= 0) {
-        this.$set(this.$refs[this.name].data[rowIndex], '_hover', false)
-      }
+      // if (this.operateFlag && rowIndex >= 0) {
+      //   this.$set(this.$refs[this.name].data[rowIndex], '_hover', false)
+      // }
     },
     /**
      * @desc   : 设置选中的行
@@ -1748,6 +1770,8 @@ export default {
         this.batchKeys.push(e.row[this.primaryKey])
       }
       this.$emit('current-change', e)
+      // 给当前行增加hover
+      this.addHover(e.rowIndex);
     },
     /**
      * @desc   : 滚动就隐藏pop

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

@@ -1314,17 +1314,17 @@ export default {
       this.$emit('cell-click',e)
     },
     /**
-     * @desc   : 鼠标移入增加新增和删除按钮
+     * @desc   : 增加当前行hover
      * @author : 周兴
-     * @date   : 2022/4/19 10:56
+     * @date   : 2023/5/17 16:39
      */
-    handleCellMouseEnter(e) {
+    addHover(rowIndex){
       if (this.readonly) {
         return;
       }
       if (this.operateFlag) {
         // 如果行不变，不用执行
-        if (e && (e.rowIndex != this.rowIndex)) {
+        if (rowIndex != this.rowIndex) {
           if (this.tableData && this.tableData.length > 0) {
             this.tableData.forEach(it => {
               this.$set(it, '_hover', false)
@@ -1332,41 +1332,66 @@ export default {
           }
         }
         setTimeout(() => {
-          if (e.rowIndex >= 0 && this.tableData[e.rowIndex]) {
-            this.$set(this.tableData[e.rowIndex], '_hover', true)
+          if (rowIndex >= 0 && this.tableData[rowIndex]) {
+            this.$set(this.tableData[rowIndex], '_hover', true)
           }
-        }, 300)
-      }
-      // 鼠标移入后，当前行变为编辑状态
-      if (e && e.row) {
-        this.colIndex = e.columnIndex;
-        // 鼠标移入自动进行行切换
-        if (this.mouseEnterEditFlag) {
-          // this.$refs[this.name].setActiveRow(e.row)
-          // // console.log('ttt',e.row,e.rowIndex,this.currentRowIndex)
-          // this.$refs[this.name].setCurrentRow(e.row)
-          // if(this.rowIndex !== e.rowIndex){
-          //   this.currentChangeGetData({ oldRowIndex:this.rowIndex,rowIndex:e.rowIndex })
-          // }
-        }
-        this.rowIndex = e.rowIndex;
+        }, 30)
       }
     },
     /**
+     * @desc   : 鼠标移入增加新增和删除按钮
+     * @author : 周兴
+     * @date   : 2022/4/19 10:56
+     */
+    handleCellMouseEnter(e) {
+      // if (this.readonly) {
+      //   return;
+      // }
+      // if (this.operateFlag) {
+      //   // 如果行不变，不用执行
+      //   if (e && (e.rowIndex != this.rowIndex)) {
+      //     if (this.tableData && this.tableData.length > 0) {
+      //       this.tableData.forEach(it => {
+      //         this.$set(it, '_hover', false)
+      //       })
+      //     }
+      //   }
+      //   setTimeout(() => {
+      //     if (e.rowIndex >= 0 && this.tableData[e.rowIndex]) {
+      //       this.$set(this.tableData[e.rowIndex], '_hover', true)
+      //     }
+      //   }, 300)
+      // }
+      // // 鼠标移入后，当前行变为编辑状态
+      // if (e && e.row) {
+      //   this.colIndex = e.columnIndex;
+      //   // 鼠标移入自动进行行切换
+      //   if (this.mouseEnterEditFlag) {
+      //     // this.$refs[this.name].setActiveRow(e.row)
+      //     // // console.log('ttt',e.row,e.rowIndex,this.currentRowIndex)
+      //     // this.$refs[this.name].setCurrentRow(e.row)
+      //     // if(this.rowIndex !== e.rowIndex){
+      //     //   this.currentChangeGetData({ oldRowIndex:this.rowIndex,rowIndex:e.rowIndex })
+      //     // }
+      //   }
+      //   this.rowIndex = e.rowIndex;
+      // }
+    },
+    /**
      * @desc   : 鼠标移出删除新增和删除按钮
      * @author : 周兴
      * @date   : 2022/4/19 10:56
      */
     handleCellMouseLeave(e) {
-      if (this.operateFlag) {
-        setTimeout(() => {
-          if (e && e.rowIndex != this.rowIndex) {
-            if (e.rowIndex >= 0 && this.tableData[e.rowIndex]) {
-              this.$set(this.tableData[e.rowIndex], '_hover', false)
-            }
-          }
-        }, 300)
-      }
+      // if (this.operateFlag) {
+      //   setTimeout(() => {
+      //     if (e && e.rowIndex != this.rowIndex) {
+      //       if (e.rowIndex >= 0 && this.tableData[e.rowIndex]) {
+      //         this.$set(this.tableData[e.rowIndex], '_hover', false)
+      //       }
+      //     }
+      //   }, 300)
+      // }
     },
     /**
      * @desc   : 开关控制
@@ -1902,6 +1927,8 @@ export default {
       e.oldRowIndex = this.currentRowIndex;
       this.$emit('current-change', e, this.tableData);
       this.currentRowIndex = e.rowIndex;
+      // 给当前行增加hover
+      this.addHover(this.currentRowIndex);
     },
     /**
      * @desc   : 根据field获取

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

@@ -1385,59 +1385,84 @@ export default {
       }
     },
     /**
-     * @desc   : 鼠标移入增加新增和删除按钮
+     * @desc   : 增加当前行hover
      * @author : 周兴
-     * @date   : 2022/4/19 10:56
+     * @date   : 2023/5/17 16:39
      */
-    handleCellMouseEnter(e) {
+    addHover(rowIndex){
       if (this.readonly) {
-        return
+        return;
       }
       if (this.operateFlag) {
         // 如果行不变，不用执行
-        if (e && (e.rowIndex != this.rowIndex)) {
+        if (rowIndex != this.rowIndex) {
           if (this.tableData && this.tableData.length > 0) {
             this.tableData.forEach(it => {
               this.$set(it, '_hover', false)
             })
           }
-          setTimeout(() => {
-            if (e.rowIndex >= 0 && this.tableData[e.rowIndex]) {
-              this.$set(this.tableData[e.rowIndex], '_hover', true)
-            }
-          }, 300)
-        }
-      }
-      // 鼠标移入后，当前行变为编辑状态
-      if (e && e.row) {
-        this.colIndex = e.columnIndex
-        // 鼠标移入自动进行行切换
-        if (this.mouseEnterEditFlag) {
-          // this.$refs[this.name].setActiveRow(e.row)
-          // // console.log('ttt',e.row,e.rowIndex,this.currentRowIndex)
-          // this.$refs[this.name].setCurrentRow(e.row)
-          // if(this.rowIndex !== e.rowIndex){
-          //   this.currentChangeGetData({ oldRowIndex:this.rowIndex,rowIndex:e.rowIndex })
-          // }
         }
-        this.rowIndex = e.rowIndex
+        setTimeout(() => {
+          if (rowIndex >= 0 && this.tableData[rowIndex]) {
+            this.$set(this.tableData[rowIndex], '_hover', true)
+          }
+        }, 30)
       }
     },
     /**
+     * @desc   : 鼠标移入增加新增和删除按钮
+     * @author : 周兴
+     * @date   : 2022/4/19 10:56
+     */
+    handleCellMouseEnter(e) {
+      // if (this.readonly) {
+      //   return
+      // }
+      // if (this.operateFlag) {
+      //   // 如果行不变，不用执行
+      //   if (e && (e.rowIndex != this.rowIndex)) {
+      //     if (this.tableData && this.tableData.length > 0) {
+      //       this.tableData.forEach(it => {
+      //         this.$set(it, '_hover', false)
+      //       })
+      //     }
+      //     setTimeout(() => {
+      //       if (e.rowIndex >= 0 && this.tableData[e.rowIndex]) {
+      //         this.$set(this.tableData[e.rowIndex], '_hover', true)
+      //       }
+      //     }, 300)
+      //   }
+      // }
+      // // 鼠标移入后，当前行变为编辑状态
+      // if (e && e.row) {
+      //   this.colIndex = e.columnIndex
+      //   // 鼠标移入自动进行行切换
+      //   if (this.mouseEnterEditFlag) {
+      //     // this.$refs[this.name].setActiveRow(e.row)
+      //     // // console.log('ttt',e.row,e.rowIndex,this.currentRowIndex)
+      //     // this.$refs[this.name].setCurrentRow(e.row)
+      //     // if(this.rowIndex !== e.rowIndex){
+      //     //   this.currentChangeGetData({ oldRowIndex:this.rowIndex,rowIndex:e.rowIndex })
+      //     // }
+      //   }
+      //   this.rowIndex = e.rowIndex
+      // }
+    },
+    /**
      * @desc   : 鼠标移出删除新增和删除按钮
      * @author : 周兴
      * @date   : 2022/4/19 10:56
      */
     handleCellMouseLeave(e) {
-      if (this.operateFlag) {
-        setTimeout(() => {
-          if (e && e.rowIndex != this.rowIndex) {
-            if (e.rowIndex >= 0 && this.tableData[e.rowIndex]) {
-              this.$set(this.tableData[e.rowIndex], '_hover', false)
-            }
-          }
-        }, 300)
-      }
+      // if (this.operateFlag) {
+      //   setTimeout(() => {
+      //     if (e && e.rowIndex != this.rowIndex) {
+      //       if (e.rowIndex >= 0 && this.tableData[e.rowIndex]) {
+      //         this.$set(this.tableData[e.rowIndex], '_hover', false)
+      //       }
+      //     }
+      //   }, 300)
+      // }
     },
     /**
      * @desc   : desc
@@ -2275,7 +2300,11 @@ export default {
      * @date   : 2022/4/21 13:43
      */
     currentChangeGetData(e) {
-      this.$emit('current-change', e, this.tableData)
+      e.oldRowIndex = this.currentRowIndex;
+      this.$emit('current-change', e, this.tableData);
+      this.currentRowIndex = e.rowIndex;
+      // 给当前行增加hover
+      this.addHover(this.currentRowIndex);
     },
     /**
      * @desc   : 根据field获取
@@ -4107,6 +4136,17 @@ export default {
               itemCode: 'uniqueCode',
               itemName: 'moldlineCode'
             },
+            //todo 暂时先注掉
+            // //产品型号
+            // {
+            //   itemCode: 'uniqueCode',
+            //   itemName: 'appModelProduct'
+            // },
+            // //模具型号
+            // {
+            //   itemCode: 'uniqueCode',
+            //   itemName: 'appModelMould'
+            // },
           ]
           //替换的列
           this.columnsUpdate.push(

src/libs/tools/date-tools.js

@@ -138,7 +138,9 @@ Date.prototype.getLastDateStr = function () {
  * @date   : 2022/11/16 14:00
  */
 Date.prototype.addDays = function (days) {
-  return new Date(this.setDate(this.getDate() + days))
+  if(!this)return this;
+  let value = new Date(this.toDateStr());
+  return new Date(value.setDate(value.getDate() + days))
 }
 
 /**

src/view-app/app/piecework-procedure/finish-check/index.vue

@@ -11,8 +11,8 @@
       :label="$t('appProductionJobNumber')" placeholderType="scan" @changeBarCode="queryUser" />
     <!--    产品条码-->
     <dk-app-field :label="$t('appProductCode')" ref="barCode" v-model="formData.barCode" @changeBarCode="queryBarCode"
-      @clickRightIcon="openQRCodeScan('barCode')" :disabled="disabled" :isScanFlg="true" :readonly="(formData.prodUserCode.length == 0)"
-      placeholderType="scan"></dk-app-field>
+      @clickRightIcon="openQRCodeScan('barCode')" :disabled="disabled" :isScanFlg="true"
+      :readonly="(formData.prodUserCode.length == 0)" placeholderType="scan"></dk-app-field>
     <div style="height: 15px;background: #f8f9fd;"></div>
     <div v-if="this.formData.uniqueCode" class="app-form">
       <div class="app-form-main">
@@ -29,8 +29,25 @@
           :placeholderFlag="false" />
         <!--    产品分级-->
         <dk-app-field v-model="formData.gradeKindName" :label="$t('appProductClassification')" :readonly="true"
-          @click="openDropdown({ key: 'productClassification' })" placeholderType="choose" is-link
-          arrow-direction="down" />
+          placeholderType="choose" />
+
+
+
+
+
+        <!--    产品分级标签-->
+        <div
+          style="display: flex; display: flex;padding-left: 8px; flex-wrap: wrap;align-content: stretch;width: 100%;flex-direction: row; justify-content: flex-start;background: white; align-items: center;">
+          <div v-for="(item, index)  in gradeKindList" :key="index">
+            <div style="padding-left: 5px;margin-top: 2px;">
+              <van-button v-if="item.infotype === 'default'" plain type="info" color="#95A8CB"
+                @click="buttonClick(item, index)" size="small">{{ item.gradeName }}</van-button>
+
+              <van-button v-else type="info" color="#606EB2" size="small">{{
+                item.gradeName }}</van-button>
+            </div>
+          </div>
+        </div>
         <!--    缺陷号-->
         <dk-app-field v-if="defectFlag" v-model="formData.defectNo" ref="defectNo" :label="$t('appDefectCode')"
           :readonly="readonlyFlag" @changeBarCode="getCheckNodeDefectCode" />
@@ -136,6 +153,33 @@ export default {
   },
   methods: {
     /**
+* @desc   : 产品分级按钮选择事件
+* @author : 于继渤
+* @date   : 2023/2/7 17:26
+*/
+    buttonClick(item, index_z) {
+      this.gradeKindList.forEach((it, index) => {
+        if (index_z === index) {
+          it.infotype = 'info'
+        } else {
+          it.infotype = 'default'
+        }
+      })
+      this.formData.gradeKindId = item.gradeId
+      this.formData.gradeKindName = item.gradeName
+      this.formData.opnGradeKind = item.gradeKind
+      if (item.gradeKind && ((item.gradeKind.indexOf(this.$t('appExcellent')) === -1))) {
+        this.productionDefectList = this.productionDefectListTemp
+        this.defectFlag = true
+      } else {
+        this.productionDefectListTemp = this.productionDefectList
+        this.productionDefectList = []
+        this.defectFlag = false
+        this.formData.defectNo = ''
+        this.formData.defectNoName = ''
+      }
+    },
+    /**
          * @desc   : 各个画面最后执行结果
          * @author : 姜永辉
          * @date   : 2023/5/8 16:25

src/view-app/main/main.vue

@@ -3,7 +3,7 @@
   <div class="main-app">
     <!-- 顶部导航栏 -->
     <dk-app-nav-bar v-if="barPlaceHolder" :title="activeTitle" :left-arrow="false" :leftPopoverFlag="true"
-      :actions="actionsPopoverList" :placeholder="barPlaceHolder"></dk-app-nav-bar>
+      :actions="actionsPopoverList" :placeholder="barPlaceHolder" @toApp="toApp"></dk-app-nav-bar>
     <!-- 这是二级路由的挂载点 -->
     <keep-alive :include="cacheList">
       <router-view ref="child" />
@@ -21,8 +21,9 @@
 <script>
 import { getNewTagList, localSave, localRead, localRemove } from "@/libs/base/util";
 import { mapMutations } from "vuex";
+import {mapActions} from 'vuex'
 import { appIndexMixin } from '@/mixins/appindex.js'
-
+import {convertToChildrenMain, handleMenu} from "@/libs/tools/user-tools";
 export default {
   name: "app-main",
   mixins: [appIndexMixin],
@@ -37,6 +38,7 @@ export default {
       actionsPopoverList: [  //左上角 气泡跳转
         { menuName: '模具跟踪表', ImageUri: require("@/assets/images/app-image/" + "mould_tracking" + "\.png"), toRouter: 'app-mold-tracking' },
         { menuName: '产品跟踪表', ImageUri: require("@/assets/images/app-image/" + "procduct_track" + "\.png"), toRouter: 'app-product-tracking' },
+        { menuName: '基础数据刷新', ImageUri: require('@/assets/images/app-image/refresh_basic_data.png'), toRouter: '' ,type:1,},
       ]
     };
   },
@@ -100,7 +102,9 @@ export default {
     ...mapMutations([
       'setTagNavList',
     ]),
-
+    ...mapActions([
+      'setMenuListAfter'
+    ]),
     /**
      * @desc   : 获取当前手机厂商
      * @author : 姜永辉
@@ -131,6 +135,36 @@ export default {
           }
         })
     },
+
+    toApp(item){
+      this.refreshBasicData()
+    },
+
+        /**
+     * @desc   : 刷新基础数据
+     * @author : 于继渤
+     * @date   : 2023/5/11 10:26
+     */
+     refreshBasicData() {
+      this.excute(this.$service.commonService, this.$service.commonService.refreshBasicData, {
+        appCode:this.$config.appCode.PDA_PROD
+      }, true, this.$t('refresh')).then(res => {
+        if (res.code === this.$config.SUCCESS_CODE) {
+          if (res.data) {
+             // 功能权限
+             if (res.data.function) {
+              sessionStorage.setItem('function', JSON.stringify(res.data.function))
+            }
+            let menu = res.data.menu;
+            menu = handleMenu(menu);
+            let arr = convertToChildrenMain(menu);
+            this.setMenuListAfter(arr)
+            // 刷新页面
+            location.reload();
+          }
+        }
+      })
+    },
   },
   created() {
     this.getManufactures()

src/view/core/role/index.vue

@@ -48,7 +48,6 @@
         </EditTable> -->
 
 
-
         <DkTable slot="right" ref="editTable" :data="userList" :pageFlag="true" :selectFlag="false" :checkDisable="false"
           :operateFlag="true" @delRow="deleteUser" :enabled-repeat-id="'userId'" :height="this.tableHeight"
           primaryKey="userId" :choose-flag="false">

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/custom-report/form.vue

@@ -247,7 +247,6 @@
           <SelectPop v-model="formDataDefault.rangeSel" :multiple="false" :options="rangeSelList" ref="rangeSel"
                      labelKey="label"
                      valueKey="value"
-                     :showClearFlag="false"
                      @on-select-label="handleSelectRange">
           </SelectPop>
         </DkFormItem>
@@ -821,7 +820,11 @@ export default {
      * @date   : 2023/5/16 17:02
      */
     handleSelectRange(row) {
-      this.formDataDefault.rangeSelLabel = row.label
+      if(row){
+        this.formDataDefault.rangeSelLabel = row.label
+      }else{
+        this.formDataDefault.rangeSelLabel = null
+      }
     },
     /**
      * @desc   : 设置日期范围的默认值
@@ -1477,8 +1480,10 @@ export default {
           }
         } else {
           let value = it.defaultValue
-          it.defaultValue = {
-            default: value
+          if(value){
+            it.defaultValue = {
+              default: value
+            }
           }
         }
       })
@@ -1592,7 +1597,6 @@ export default {
     // endregion
   },
   mounted() {
-    // 设置下拉的默认值
   }
   ,
   created() {

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

@@ -33,7 +33,7 @@
     <!--  表格部分  -->
     <DkSplit mode="vertical" v-model="split" :height="tableHeight">
       <DkTable slot="top" :id="'table-'+$options.name" ref="table-select" :data="tableData"
-               :height="this.tableHeight * split - 45"
+               :height="this.tableHeight * split - 35"
                :choose-flag="false"
                :pageFlag="true"
                primaryKey="reportId"
@@ -62,7 +62,7 @@
         <DkTable v-show="reportTab === 'condition'" :pageFlag="false"
                  :pageTotalFlag="false"
                  primaryKey="conditionId"
-                 :height="this.tableHeight * (1-split) - 25"
+                 :height="this.tableHeight * (1-split) - 15"
                  :expand-flag="true"
                  :id="'table-'+$options.name"
                  ref="detail-select"

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

@@ -461,7 +461,7 @@ export default {
           item.valueKind = this.handleReportKind(it.kind);
           item.valueFormat = {}
           // 赋值默认值
-          if(it.defaultValue && it.defaultValue.default){
+          if (it.defaultValue && it.defaultValue.default) {
             item.valueFormat.default = it.defaultValue.default;
           }
           // 如果下拉
@@ -473,9 +473,9 @@ export default {
             item.valueFormat.labelKey = 'name';
             // 获取下拉数据源
             this.getSelectData(it.conditionId, item, it.defaultValue?.default);
-          }else if(it.kind === this.$config.reportKind.dateRange){
+          } else if (it.kind === this.$config.reportKind.dateRange) {
             // 日期范围
-            if(it.defaultValue && it.defaultValue.rangeSel){
+            if (it.defaultValue && it.defaultValue.rangeSel) {
               item.valueFormat.default = this.handleDateDefault(it.defaultValue)
             }
           }
@@ -492,57 +492,58 @@ export default {
      * @author : 周兴
      * @date   : 2023/5/17 8:39
      */
-    handleDateDefault(defaultValue){
+    handleDateDefault(defaultValue) {
       let value = []
       let now = new Date();
-      switch (defaultValue.rangeSel){
+      switch (defaultValue.rangeSel) {
         // 今天
         case this.$config.rangeSel.today.value:
-          value = [now,now];
+          value = [now, now];
           break;
         // 昨天
         case this.$config.rangeSel.yesterday.value:
           let yesterday = now.addDays(-1);
-          value = [yesterday,yesterday];
+          value = [yesterday, yesterday];
           break;
         // 本周
         case this.$config.rangeSel.thisWeek.value:
-          value = [now.getWeekFirstDay(),now.getWeekLastDay()];
+          value = [now.getWeekFirstDay(), now.getWeekLastDay()];
           break;
         // 近一周
         case this.$config.rangeSel.nearlyWeek.value:
-          value = [now.addDays(-6),now];
+          let beginDate = now.addDays(-6)
+          value = [now.addDays(-6), now];
           break;
         // 上一周
         case this.$config.rangeSel.beforeWeek.value:
           let beforeDay = now.addDays(-7);
-          value = [beforeDay.getWeekFirstDay(),beforeDay.getWeekLastDay()];
+          value = [beforeDay.getWeekFirstDay(), beforeDay.getWeekLastDay()];
           break;
         // 本月
         case this.$config.rangeSel.thisMonth.value:
-          value = [now.getFirstDateStr(),now.getLastDateStr()];
+          value = [now.getFirstDateStr(), now.getLastDateStr()];
           break;
         // 近一月
         case this.$config.rangeSel.nearlyMonth.value:
-          value = [now.addMonths(-1),now];
+          value = [now.addMonths(-1), now];
           break;
         // 上一月
         case this.$config.rangeSel.beforeMonth.value:
           let beforeMonth = now.addMonths(-1);
-          value = [beforeMonth.getFirstDateStr(),beforeMonth.getLastDateStr()];
+          value = [beforeMonth.getFirstDateStr(), beforeMonth.getLastDateStr()];
           break;
         // 自定义
         case this.$config.rangeSel.custom.value:
           let beforeDayCustom = now;
           // 间隔月份
-          if(defaultValue.intervalMonth){
+          if (defaultValue.intervalMonth) {
             beforeDayCustom = beforeDayCustom.addMonths(-1 * defaultValue.intervalMonth)
           }
           // 间隔天数
-          if(defaultValue.intervalDay){
+          if (defaultValue.intervalDay) {
             beforeDayCustom = beforeDayCustom.addDays(-1 * defaultValue.intervalDay)
           }
-          value = [beforeDayCustom,now];
+          value = [beforeDayCustom, now];
           break;
       }
       return value;
@@ -582,7 +583,12 @@ export default {
       }
       this.excute(this.$service.customReportService, this.$service.customReportService.getSelectDataById, params).then(res => {
         if (res.code === this.$config.SUCCESS_CODE) {
-          let defaultV = defaultValue?[defaultValue]:[]
+          let defaultV = null;
+          if(item.valueKind === 'M-CHOICE'){
+            defaultV = defaultValue ? [defaultValue] : null
+          }else{
+            defaultV = defaultValue;
+          }
           // 给下拉数据源赋值
           this.$refs['searchCond'].changeOptions(item.itemCode, res.data, defaultV)
         }

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/pdm/product-code-change/index.vue

@@ -167,7 +167,6 @@ export default {
         },
         {
           itemCode: 'moldingBatch',//注浆批次
-          valueKind: 'NUMBER',
         },
         {
           itemCode: 'remarks',//备注

src/view/report/delivery-blank/index.vue

@@ -34,7 +34,7 @@
 <!--        <DkTableColumn field="modelName" :title="$t('productName')"></DkTableColumn>-->
         <!--产品型号（编码+名称）-->
         <DkTableColumn field="codeName" :title="$t('pdtModel')"></DkTableColumn>
-        <DkTableColumn field="categoryName" :title="$t('productCategoryName')"></DkTableColumn>
+        <DkTableColumn field="categoryName" :title="$t('productCategory')"></DkTableColumn>
         <DkTableColumn field="logoName" :title="$t('pdtLogoName')"></DkTableColumn>
         <DkTableColumn field="colourName" :title="$t('pdtColourName')"></DkTableColumn>
         <DkTableColumn field="renderMTime" data-type="dateTime"></DkTableColumn>