修改页面

src/views/accessrecords/ProcessMaterialWarehousingRecord.vue

@@ -220,7 +220,7 @@
             dataIndex: 'createBy'
           },
           {
-            title:'物资信息',
+            title:'描述信息',
             align:"center",
             dataIndex: 'describes'
           },

src/views/accessrecords/ProcessMaterialsDeliveryRecord.vue

@@ -254,7 +254,7 @@
             dataIndex: 'createBy'
           },
           {
-            title:'物资信息',
+            title:'描述信息',
             align:"center",
             dataIndex: 'describes',
           },

src/views/activiti/form/ProcessMaterialsDeliveryForm.vue

@@ -202,7 +202,7 @@
               defaultValue:'',
             },
             {
-              title: '物料名称及规格型号',
+              title: '物料名称',
               key: 'materialName',
               type: FormTypes.input,
               dictCode:"",
@@ -210,6 +210,23 @@
               placeholder: '请输入${title}',
               defaultValue:'',
             },
+            {
+              title: '规格',
+              key: 'specification',
+              type: FormTypes.input,
+              dictCode:"",
+              width:"200px",
+              placeholder: '请输入${title}',
+              defaultValue:'',
+            }, {
+              title: '型号',
+              key: 'type',
+              type: FormTypes.input,
+              dictCode:"",
+              width:"200px",
+              placeholder: '请输入${title}',
+              defaultValue:'',
+            },
             {
               title: '单位',
               key: 'materialUnit',
@@ -243,6 +260,7 @@
               width:"200px",
               placeholder: '请输入${title}',
               defaultValue:'',
+              disabled:true,
             },
             {
               title: '供货商',
@@ -260,6 +278,7 @@
               width:"200px",
               placeholder: '请输入${title}',
               defaultValue:'',
+              disabled:true,
             },
             {
               title: '金额（元）',
@@ -268,6 +287,7 @@
               width:"200px",
               placeholder: '请输入${title}',
               defaultValue:'',
+              disabled:true,
             },
             {
               title: '用途',
@@ -349,7 +369,7 @@
     },
     computed: {
       formDisabled() {
-        console.log("执行了")
+        // console.log("执行了")
         if (this.formBpm === true) {
           if (this.formData.disabled === false) {
             return false
@@ -466,10 +486,9 @@
           }
 
         }
-
         // 根据请发数量计算
         if(record.row.pleaseSendNumber !== '' && record.row.pleaseSendNumber !== undefined && isMA ){
-          // console.log("执行了",record.row)
+          // console.log("执行了根据请发数量计算")
           let res = record.row;
           let materialName = {}
           this.bigIdMerchandiseNewsList.forEach(item => {
@@ -511,9 +530,6 @@
           })
         }
 
-
-          // console.log('****>',value)
-
         }
 
       },

src/views/suppliesstronger/ProcessSuppliesStrongerList.vue

@@ -90,7 +90,7 @@
 
         <span slot="action" slot-scope="text, record" style="overflow: hidden;" class="table-page-search-submitButtons">
           <a-dropdown>
-            <a class="ant-dropdown-link" @click="handleDetaills(record)"><i type="down"></i>明细</a>
+            <a class="ant-dropdown-link" @click="handleDetaills(record)"><a-icon type="transaction" /> 明细</a>
           </a-dropdown>
         </span>
 
@@ -110,6 +110,7 @@
   import JDate from '@/components/jeecg/JDate.vue'
   import JSearchSelectTag from '@/components/dict/JSearchSelectTag'
   import JSuperQuery from '@/components/jeecg/JSuperQuery.vue'
+  import { getAction } from '@api/manage'
 
 
   export default {
@@ -172,15 +173,19 @@
           {
             title:'总库数量',
             align:"center",
-            dataIndex: 'materialQuantity1',
+            dataIndex: 'materialQuantity',
-            customRender:function (t,r,index) {
-              return 0;
-            }
           },
           {
             title:'项目部数量',
             align:"center",
-            dataIndex: 'materialQuantity'
+            dataIndex: 'itemQuantity',
+            // customRender:function (t,r,index) {
+            //   console.log(r)
+            //   if(r.itemQuantity === undefined){
+            //
+            //   }
+            //   return 0;
+            // }
           },
           {
             title:'核算属性',
@@ -216,6 +221,40 @@
       },
     },
     methods: {
+      // loadData(arg) {
+      //   if(!this.url.list){
+      //     this.$message.error("请设置url.list属性!")
+      //     return
+      //   }
+      //   //加载数据 若传入参数1则加载第一页的内容
+      //   if (arg === 1) {
+      //     this.ipagination.current = 1;
+      //   }
+      //   let ue= sessionStorage.getItem('USER_INFORMATION');
+      //   let res=JSON.parse(ue);
+      //   if(res.realname !== "管理员"){
+      //    return ;
+      //   }
+      //   console.log(res);
+      //   var params = this.getQueryParams();//查询条件
+      //   this.loading = true;
+      //   getAction(this.url.list, params).then((res) => {
+      //     if (res.success) {
+      //       this.dataSource = res.result.records||res.result;
+      //       if(res.result.total)
+      //       {
+      //         this.ipagination.total = res.result.total;
+      //       }
+      //     }
+      //     if(res.code===510){
+      //       this.$message.warning(res.message)
+      //     }
+      //     this.loading = false;
+      //   })
+      // },
+
+
+
       handleDetaills(record){
         console.log(record);
        this.$router.push({

src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue

@@ -318,8 +318,8 @@
               // console.log(t,r,ind);
               if(r.arrivalNotice === '1'){
                 return  "是";
-              }else{
+              }else if(r.arrivalNotice === undefined){
-                return "否";
+                return "是";
               }
             }
           },

src/views/wastematerials/ProcessWasteMaterialsList.vue

@@ -82,7 +82,7 @@
 
           <span slot="action" slot-scope="text, record" style="overflow: hidden;" class="table-page-search-submitButtons">
           <a-dropdown>
-            <a class="ant-dropdown-link" @click="handleDetail(record)">详情<a-icon type="down" /></a>
+            <a class="ant-dropdown-link" @click="handleDetail(record)"><a-icon type="transaction" /> 明细</a>
           </a-dropdown>
           </span>
 
@@ -144,10 +144,20 @@
             dataIndex: 'materialNumber'
           },
           {
-            title:'物料描述',
+            title:'物料名称',
             align:"center",
             dataIndex: 'materialDescription'
           },
+          {
+            title:'型号',
+            align:"center",
+            dataIndex: 'type'
+          },
+          {
+            title:'规格',
+            align:"center",
+            dataIndex: 'specification'
+          },
           {
             title:'计量单位',
             align:"center",

src/views/wastematerials/ProcessWasteMaterialsLists.vue

@@ -336,8 +336,9 @@
         this.createProductTime = [],
         this.createInnerTime = [],
         this.queryParam = {
-            descriptionId: this.$route.query.descriptionId,
+          merchandiseNewsId : this.$route.query.merchandiseNewsId,
-            del_flag: 0
+          materialStorageId : this.$route.query.materialStorageId,
+          del_flag: 0
         },
         getAction(this.url.list,this.queryParam).then((res)=>{
           if(res.success){
@@ -349,6 +350,7 @@
         });
       },
       loadData(){
+        console.log(this.queryParam);
         getAction(this.url.list,this.queryParam).then((res)=>{
           if(res.success){
             console.log("result ：")