修改部分问题

src/views/activiti/form/ProcessMaterialWarehousingForm.vue

@@ -703,24 +703,15 @@ import JSelectItem from '@/components/jeecgbiz/JSelectItem'
     },
     popupCallback(company, row, puwwcid) {
       let res = JSON.parse(row)
-      let params = {}
+      let param = {}
-      params.id = puwwcid
+      param.createBy = res.username
-      let invisibleCode = null
+      param.company = company
-      getAction(this.url.puwwlist, params).then((rest) => {
+      param.departId = res.departIds
-        if (rest.success) {
+      param.createTime = getCurrentTime()
-          invisibleCode = rest.result.unit
+      this.data = param
-        }
+      let fieldval = pick(this.data, 'createBy', 'company', 'departId', 'createTime')
-        let param = {}
+      this.$nextTick(() => {
-        param.createBy = res.username
+        this.form.setFieldsValue(fieldval)
-        param.company = company
-        param.departId = res.departIds
-        param.createTime = getCurrentTime()
-        this.data = param
-        console.log('获取我的数据', this.data)
-        let fieldval = pick(this.data, 'createBy', 'company', 'departId', 'createTime')
-        this.$nextTick(() => {
-          this.form.setFieldsValue(fieldval)
-        })
       })
     },
     getAssignees(v){

src/views/activiti/form/ProcessMaterialsAllotForm.vue

@@ -491,19 +491,28 @@
                 unit: item.materialsUnit,
                 materialGroup: item.materialClassify,
                 supplierName: item.supplierId,
-                price: item.materialPrice
+                price: item.materialPrice,
+                descriptionId: item.descriptionId,
                 // number : item.residueNumber === undefined ? 0 : item.residueNumber,
               }
             }
           })
-          console.log("materialName",materialName);
+          // console.log("materialName",materialName);
           if(Object.keys(materialName).length > 0){
+
+
+            this.processMaterialsAllotListTable.columns[0].options.push({
+              title: materialName.materialGroup,
+              value: materialName.descriptionId
+            })
+
+
             let values = [
               {
                 rowKey: record.row.id,
                 values: {
                   'equipment': record.row.equipment,
-                  'materialGroup': materialName.materialGroup,
+                  'materialGroup': materialName.descriptionId,
                   'materialName': materialName.name,
                   'materialUnit': materialName.unit,
                   'supplierId': materialName.supplierName,

src/views/activiti/form/ProcessMaterialsDeliveryForm.vue

@@ -476,7 +476,7 @@
           this.accountingAttributesVal = val
           this.hiegs = false
           if (this.deliveryType !== 1 ) {
-            console.log("执行账外")
+            // console.log("执行账外")
             //账外
             await this.fetchMerchandiseNewsZW()
           } else {
@@ -587,6 +587,7 @@
                 materialGroup: item.materialClassify,
                 supplierName: item.supplierId,
                 price: item.materialPrice,
+                descriptionId: item.descriptionId,
                 residueNumber: item.residueNumber === undefined ? 0 : item.residueNumber
               }
             }
@@ -595,12 +596,18 @@
           // console.log("materialName",materialName);
           if (record.row.id !== undefined && Object.keys(materialName).length > 0) {
             // console.log("materialName",materialName);
+
+            this.processMaterialsDeliveryListTable.columns[0].options.push({
+              title: materialName.materialGroup,
+              value: materialName.descriptionId
+            })
+
             let values = [
               {
                 rowKey: record.row.id,
                 values: {
                   'equipment': record.row.equipment,
-                  'materialGroup': materialName.materialGroup,
+                  'materialGroup': materialName.descriptionId,
                   'materialName': materialName.name,
                   'materialUnit': materialName.unit,
                   'supplierId': materialName.supplierName,
@@ -813,7 +820,7 @@
             id: res.departIds
           }
           let data=await getAction(this.url.queryPageDepare,de)
-          console.log(data.result);
+          // console.log(data.result);
           if(data.result.orgType === "3"){
             //  查询大品类数据 账外库
             par.departId = data.result.parentId;
@@ -1181,7 +1188,7 @@
             departId: this.data.departId
           }
           getAction(this.url.wasteMaterialsUrl, par).then((res) => {
-            console.log(res)
+            // console.log(res)
             if (res.success) {
               if (this.processMaterialsDeliveryListTable.columns[0].options.length > 0) {
                 this.processMaterialsDeliveryListTable.columns[0].options = []
@@ -1202,7 +1209,7 @@
             accountingAttributes: value
           }
           getAction(this.url.descriptionRake, par).then((res) => {
-            console.log('1231234123', res)
+            // console.log('1231234123', res)
             if (res.success) {
               if (this.processMaterialsDeliveryListTable.columns[0].options.length > 0) {
                 this.processMaterialsDeliveryListTable.columns[0].options = []
@@ -1484,7 +1491,7 @@
             }
           }
 
-          console.log('tab.dataSource', dataSource)
+          // console.log('tab.dataSource', dataSource)
           dataSource.forEach(item => {
             let par = { id: item.materialGroup }
             let param = { id: item.equipment }
@@ -1499,7 +1506,7 @@
               }
             })
             getAction(this.url.queryByIdMerchandiseNews, param).then(res => {
-              console.log(res)
+              // console.log(res)
               if (res.success) {
                 this.processMaterialsDeliveryListTable.columns[1].options = [{
                   title: res.result.materialsNumber,

src/views/activiti/historicDetail.vue

@@ -11,7 +11,7 @@
                  :dataSource="data"
                  :pagination="false"
                   ref="table">
-          <a-table-column title="#"  width="50">
+          <a-table-column title="序号"  width="50">
             <template slot-scope="t,r,i" >
               <span> {{i+1}} </span>
             </template>