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

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

@@ -743,6 +743,11 @@
         // 查询条件
         searchCond: {},
         searchContent: [],
+        // 外部传入的查询条件
+        otherCondition: {
+          type: Object,
+          default: null
+        },
       }
     },
     watch: {
@@ -3666,6 +3671,10 @@
             //todo 暂时注掉 2023年4月25日08:46:09  zdl
             // param.moldlineItemNoList =  this.children.map(it=>it.moldlineItemNo).unique()
           }
+          // 拼接外部传入的其他参数otherCondition
+          if (this.otherCondition) {
+            param = Object.assign(param, this.otherCondition)
+          }
           if (this.searchCond) {
             param = Object.assign(param, this.searchCond._value)
           }

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

@@ -452,7 +452,12 @@ export default {
       param.manageUser = this.$store.state.user.id
       param.ftyId = this.$store.state.user.ftyId
       if (this.searchCond) {
-        param = Object.assign(param, this.searchCond._value)
+        if(this.searchCond._value.lastMoldingDate){
+          param = Object.assign(param, this.searchCond._value)
+        }else{
+          this.searchCond._value.lastMoldingDate= new Date().toDateStr()
+          param = Object.assign(param, this.searchCond._value)
+        }
       }
       if (!param.lastMoldingDate) {
         this.$message.error(this.$t('W_093', {
@@ -728,6 +733,9 @@ export default {
      */
     chooseMoldline() {
       this.chooseModal = this.type === this.$config.formMode.add ? true : false
+      if(this.chooseModal){
+        this.getDataTable()
+      }
     },
     /**
      * @desc   : 清空明细