1

src/views/production/materialprocurement/materialProcurementList.vue

@@ -88,7 +88,7 @@
         <a-button  size="small" @click="examineApprove">审批</a-button>
         <a-button  size="small" @click="abstainExamineApprove">弃审</a-button>
         <a-button size="small" @click="exportList('材料请购单')">导出</a-button>
-        <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl">
+        <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader"  @change="handleUploadChange" :action="importExcelUrl">
             <a-button  size="small">导入</a-button>
         </a-upload>
         <a-button  size="small" @click="entireClose">整单关闭</a-button>
@@ -221,13 +221,13 @@
               ellipsis: true,
 
             },
-            {
-              title: '备注',
-              align:"center",
-              dataIndex: 'remarks',
-              ellipsis: true,
+            // {
+            //   title: '备注',
+            //   align:"center",
+            //   dataIndex: 'remarks',
+            //   ellipsis: true,
 
-            },
+            // },
             {
               title: '工单号',
               align:"center",
@@ -256,7 +256,7 @@
               ellipsis: true,
             },
           ],
-          importExcelUrl:'/production/safetyStock/importExcel',
+          importExcelUrl:window._CONFIG['domianURL'] + '/materialRequisition/madeMaterialRequisition/importExcel',
              // ---------workflow  by fhf start -------------
           serviceName: 'assetAllocationService',
           // ---------workflow  by fhf end -------------
@@ -551,6 +551,15 @@
          }
         })
       },
+      handleUploadChange({ file, fileList }){
+                if (file.status === 'done'&&file.response.success) {
+                    this.$message.success(file.response.message)
+                    this.getTableList()
+                }else if(file.status === 'done'&&!file.response.success){
+                    this.$message.error(file.response.message)
+                }
+                
+      },
       //请购单
       synchronizationData(){
         var arrType = []

src/views/production/safetyStock/encoderList.vue

@@ -42,6 +42,11 @@
                       <a-input placeholder="请输入" v-model="queryParam.fixedLength"></a-input>
                     </a-form-item>
                   </a-col>
+                  <a-col :md="4" :sm="24">
+                    <a-form-item label="料品属性">
+                      <a-input placeholder="请输入" v-model="queryParam.attribute"></a-input>
+                    </a-form-item>
+                  </a-col>
                 </template>
                 <a-col  :md="4" :sm="24">
                   <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
@@ -145,6 +150,12 @@
                   }
                 },
                 {
+                  title: 'u9编码',
+                  align:"center",
+                  dataIndex: 'inventoryCode',
+                  ellipsis: true,
+    
+                }, {
                   title: '料品名称',
                   align:"center",
                   dataIndex: 'inventoryName',
@@ -197,6 +208,7 @@
                   title: '料品属性',
                   align:"center",
                   dataIndex: 'attribute',
+                  width: 200,
                   ellipsis: true,
     
                 }, {
@@ -204,6 +216,14 @@
                   align:"center",
                   dataIndex: 'sync',
                   ellipsis: true,
+                  customRender:function (t, r, index) {
+                    if(t == '是'){
+                      return t +"（"+r.inventoryCode+"）";
+                    }else{
+                      return t;
+                    }
+                    
+                  }
     
                 },
               ],

src/views/production/safetyStock/safetyStockList.vue

@@ -67,7 +67,7 @@
             <a-button  size="small" @click='editList'>修改</a-button>
             <a-button size="small" @click="delectList">删除</a-button>
             <a-button  size="small" @click="detailList">详情</a-button>
-            <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl">
+            <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" @change="handleUploadChange"  :action="importExcelUrl">
                <a-button  size="small">导入</a-button>
             </a-upload>
             <a-button size="small" @click="exportList('安全库存列表')">导出</a-button>
@@ -201,7 +201,7 @@
               url: {
                     list: "/production/safetyStock/list",
               },
-              importExcelUrl:'/production/safetyStock/importExcel',
+              importExcelUrl:window._CONFIG['domianURL'] + '/production/safetyStock/importExcel',
                  // ---------workflow  by fhf start -------------
               serviceName: 'assetAllocationService',
               // ---------workflow  by fhf end -------------
@@ -366,7 +366,16 @@
                   },
                 } 
               }  
-            }
+            },
+             handleUploadChange({ file, fileList }){
+                if (file.status === 'done'&&file.response.success) {
+                    this.$message.success(file.response.message)
+                    this.getTableList()
+                }else if(file.status === 'done'&&!file.response.success){
+                    this.$message.error(file.response.message)
+                }
+                
+            },
         }
     }
       </script>