Merge remote-tracking branch 'origin/dev' into dev

src/components/jeecg/modal/ProcessPlan.vue

@@ -215,7 +215,7 @@
            }*/
         ],
         url: {
-          list: '/hy/processUdgetPlan/list',
+          list: '/hy/processUdgetPlan/listByplan',
           delete: '/hy/processUdgetPlan/delete',
           deleteBatch: '/hy/processUdgetPlan/deleteBatch',
           exportXlsUrl: '/hy/processUdgetPlan/exportXls',
@@ -257,28 +257,28 @@
       }
     },
     methods: {
-      initDictConfig(){
-        initDictOptions('sys_depart,depart_name,id').then((res) => {
-          if (res.success) {
-            this.$set(this.dictOptions, 'company', res.result)
-          }
-        })
-        initDictOptions('sys_depart,depart_name,id').then((res) => {
-          if (res.success) {
-            this.$set(this.dictOptions, 'sysOrgCode', res.result)
-          }
-        })
-        initDictOptions('').then((res) => {
-          if (res.success) {
-            this.$set(this.dictOptions, 'materialType', res.result)
-          }
-        })
-        initDictOptions('').then((res) => {
-          if (res.success) {
-            this.$set(this.dictOptions, 'processPlan', res.result)
-          }
-        })
-      },
+      // initDictConfig(){
+      //   initDictOptions('sys_depart,depart_name,id').then((res) => {
+      //     if (res.success) {
+      //       this.$set(this.dictOptions, 'company', res.result)
+      //     }
+      //   })
+      //   initDictOptions('sys_depart,depart_name,id').then((res) => {
+      //     if (res.success) {
+      //       this.$set(this.dictOptions, 'sysOrgCode', res.result)
+      //     }
+      //   })
+      //   initDictOptions('').then((res) => {
+      //     if (res.success) {
+      //       this.$set(this.dictOptions, 'materialType', res.result)
+      //     }
+      //   })
+      //   initDictOptions('').then((res) => {
+      //     if (res.success) {
+      //       this.$set(this.dictOptions, 'processPlan', res.result)
+      //     }
+      //   })
+      // },
       onClearSelected() {
         this.selectedRowKeys = []
         this.selectionRows = []
@@ -297,9 +297,9 @@
           return
         }
         //加载数据 若传入参数1则加载第一页的内容
-        if (arg === 1) {
-          this.pagination.current = 1
-        }
+  //      if (arg === 1) {
+          this.pagination.current = arg
+     //   }
          this.onClearSelected()
         var params = this.getQueryParams()//查询条件
         this.loading = true

src/views/activiti/form/ProcessMaterialWarehousingForm.vue

@@ -84,7 +84,7 @@
           :disabled="formDisabled"
           :rowNumber="true"
           :rowSelection="true"
-          :actionButton="true" />
+          :actionButton="false" />
       </a-tab-pane>
     </a-tabs>
     <div class="div_process">

src/views/activiti/form/ProcessMaterialsAllotForm.vue

@@ -44,7 +44,7 @@
           </a-col>
           <a-col :span="8">
             <a-form-item label="被调拨部门" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-select-depart v-decorator="['beAllotDepartment',validatorRules.beAllotDepartment]" multi @change ='Department'/>
+              <j-select-depart v-decorator="['beAllotDepartment',validatorRules.beAllotDepartment]"  @change ='Department'/>
             </a-form-item>
           </a-col>
           <a-col :span="8
@@ -680,14 +680,15 @@
           let params = {}
           params.unit = value
           getAction(this.url.puwwlistByuntil, params).then((rest) => {
-            if (rest.success) {
+            console.log("rest>>>>>>>>>>>>>>>>>>>>>>>>>>>>",rest)
+            if (rest.success && rest.result.total>0) {
               this.libraryAssociationIdInvisible = value
             }else {
               this.libraryAssociationIdInvisible = 'ZK'
             }
-
+            console.log("value>>>>>>>>>>>>>>>>>>>>>>>>>>>>",this.libraryAssociationIdInvisible)
           })
-          console.log("value>>>>>>>>>>>>>>>>>>>>>>>>>>>>",this.libraryAssociationIdInvisible)
+
         }
 
       },

src/views/activiti/form/ProcessMaterialsDeliveryForm.vue

@@ -941,9 +941,8 @@
       init(){
         this.btndisabled = true;
         var r = this.processData;
-        this.getAction(this.url.getForm,{
-          tableId:r.tableId,
-          tableName:r.tableName,
+        this.getAction(this.url.queryById,{
+          id:r.tableId
         }).then((res)=>{
           if (res.success){
             let formData = res.result;
@@ -973,11 +972,13 @@
         this.getAllTable().then(tables => {
           return validateFormAndTables(this.form, tables)
         }).then(allValues=>{
-          console.log('所有数据',allValues)
+
           if (typeof this.classifyIntoFormData !== 'function') {
             throw this.throwNotFunction('classifyIntoFormData')
           }
           let formData = this.classifyIntoFormData(allValues)
+          formData.fileId = getStringArry(formData.fileId)
+          console.log('所有数据',formData)
           if (new Date(formData.createTime).getTime()/100>new Date(formData.deliveryTime).getTime()/100){
             this.$message.error("出库时间不能小于当前流程发起时间")
             return;
@@ -1033,6 +1034,12 @@
       },
       /** 调用完edit()方法之后会自动调用此方法 */
       editAfter() {
+        if (this.data.id != null && this.data.id != '' && this.data.id != undefined && this.data.fileId != null && this.data.fileId != '') {
+          //1、文件回显
+          this.data = getRecord(this.data)
+
+        }
+        console.log('回显数据',this.data)
         let fieldval = pick(this.data,'id','company','createTime','sysOrgCode','createBy','materialType','deliveryTime','fileId')
         this.$nextTick(() => {
           this.form.setFieldsValue(fieldval)