采购

src/BIZComponents/innerdetails.vue

@@ -41,11 +41,11 @@
                   <span>{{ infoData?.createTime }}</span>
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
+              <!-- <el-col :span="8">
                 <el-form-item label="状态:">
                   <span>{{ stepsTitle }}</span>
                 </el-form-item>
-              </el-col>
+              </el-col> -->
               <el-col :span="8">
                 <el-form-item label="审核人:">
                   <span>{{ infoData?.verifyName }}</span>
@@ -248,11 +248,11 @@
             :header-cell-style="rowClass"
             v-el-table-infinite-scroll="pickingHandleScroll"
             @selection-change="handleSelectionChange"
-
           >
             <el-table-column label="序号" type="index" width="50">
             </el-table-column>
-            <el-table-column type="selection" width="55" align="center"> </el-table-column>
+            <el-table-column type="selection" width="55" align="center">
+            </el-table-column>
 
             <el-table-column
               label="编码"
@@ -492,7 +492,7 @@
         materielPageNum: 1,
         codeList: [],
         infoData: {},
-        stepsTitle: '已完成',
+        // stepsTitle: '已完成',
         stepsStatus: 'success',
         active: 0
       };
@@ -608,8 +608,12 @@
       ...mapActions('dict', ['requestDict']),
       getSceneState: useDictLabel(sceneStateEnum),
       handleAssetType(r) {
-        const code = this.codeList.find((item) => item.dictCode == r);
-        return code?.dictValue;
+        let codes = r.split(',');
+
+        let name = codes.map((code) => {
+          return this.codeList.find((val) => val.dictCode == code)?.dictValue;
+        });
+        return name.toString();
       },
       tableRowClassName({ row, rowIndex }) {
         if (row.result == 2) {
@@ -719,7 +723,7 @@
           item['productCode'] = item.categoryCode;
           item['measuringUnit'] = item.measureUnit;
           item['productId'] = item.categoryId;
-          item['receiveTotalWeight']=item.weight;
+          item['receiveTotalWeight'] = item.weight;
           this.productList.forEach((val) => {
             if (item.categoryCode == val.categoryCode) {
               item['warehouseId'] = val.warehouseId;

src/BIZComponents/outdetails.vue

@@ -474,7 +474,9 @@
     getInfoBySourceBizNoAPI,
     getInfoBySourceBizNoAll
   } from '@/api/wms';
-  // import { getInfoBySourceBizNoAll } from '@/api/wms';
+  import {
+    getUserDetail
+  } from '@/api/system/organization/index.js';
 
   import { fieldModelAPI } from '@/api/main';
   export default {
@@ -620,8 +622,12 @@
       ...mapActions('dict', ['requestDict']),
       getSceneState: useDictLabel(outputSceneStateEnum),
       handleAssetType(r) {
-        const code = this.codeList.find((item) => item.dictCode == r);
-        return code?.dictValue;
+        let codes = r&&r.split(',');
+
+        let name = codes?.map((code) => {
+          return this.codeList.find((val) => val.dictCode == code)?.dictValue;
+        });
+        return name?.toString();
       },
       tableRowClassName({ row, rowIndex }) {
         console.log(row);
@@ -649,20 +655,21 @@
       async _getInfo(sourceBizNo, type, list = []) {
         const dataArray = await getInfoBySourceBizNoAll(sourceBizNo);
         let res = {};
-       
+
         if (dataArray && dataArray.length > 0) {
           res = JSON.parse(JSON.stringify(dataArray[0]));
-          res['outInDetailList']=[]
-          dataArray.forEach(item=>{
-            console.log(item,'item')
-            item.outInDetailList.forEach(val=>{
-              val['bizNo']=item.bizNo
-              res['outInDetailList'].push(val)
-            })
-          })
+          res['outInDetailList'] = [];
+          dataArray.forEach((item) => {
+            console.log(item, 'item');
+            item.outInDetailList.forEach((val) => {
+              val['bizNo'] = item.bizNo;
+              res['outInDetailList'].push(val);
+            });
+          });
           res['bizNo'] = dataArray.map((item) => item.bizNo);
         }
-        console.log(res,'res')
+        let user=await getUserDetail(res.extInfo?.createUserId)
+        res.extInfo['deptName']=user.deptName
         // res
         this.init(res, type);
       },
@@ -681,7 +688,7 @@
                     ...packingItem,
                     categoryName: productItem.categoryName,
                     categoryCode: productItem.categoryCode,
-                    bizNo:productItem.bizNo,
+                    bizNo: productItem.bizNo,
                     materialDetailList: packingItem.materialDetailList.map(
                       (materialItem) => {
                         return {

src/api/system/file/index.js

@@ -82,3 +82,24 @@ export async function getFileList (data) {
   }
   return Promise.reject(new Error(res.data.message));
 }
+
+
+/**
+ * 导入文件 批量
+ * @param file 文件
+ */
+export async function importBatch(data) {
+  const formData = new FormData();
+  data.multiPartFiles.forEach((item, index) => {
+    formData.append(`file`, item);
+  });
+  const res = await request.post(
+    `/eom/saleorder/importFile`,
+    formData
+  );
+  if (res.data.code === '0') {
+    return res.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+

src/components/upload/import-dialog.vue

@@ -9,11 +9,12 @@
           :show-file-list="false"
           :http-request="handlSuccess"
           :before-upload="beforeUpload"
+          :multiple="true"
         >
           <el-button icon="el-icon-plus" size="small" type="primary"
             >文件上传</el-button
           >
-          <div slot="tip" class="el-upload__tip">
+          <!-- <div slot="tip" class="el-upload__tip">
             只能上传excel文件，点击
             <el-link
               type="primary"
@@ -22,7 +23,7 @@
             >
               下载模板</el-link
             >
-          </div>
+          </div> -->
         </el-upload>
       </el-form-item>
       <el-form-item label="上传列表">

src/enum/dict.js

@@ -239,7 +239,7 @@ export const lbjtList = {
 //需求类型
 export const requirementSourceType=[
   { value: '1', label: '生产性物资采购' },
-  { value: '2', label: '非生产性物资采' },
+  { value: '2', label: '非生产性物资采购' },
   { value: '3', label: '带料生产委外' },
   { value: '4', label: '不带料生产委外' },
   { value: '5', label: '研发委外' },

src/views/saleManage/saleOrder/invoice/components/print-template-jsyp.vue

@@ -67,9 +67,9 @@
         "
       >
         <span style="width: 39%"
-          >受托生产企业：湖南天济草堂制药股份有限公司</span
+          >受托生产企业：</span
         >
-        <span style="width: 39%">地址：长沙高新开发区环联路7号</span>
+        <span style="width: 39%">地址：</span>
         <span style="width: 22%"></span>
       </div>
       <div