【nev-pc】需求及bug修改优化

fe/PC/src/api/wms-api.js

@@ -787,6 +787,19 @@ export function getDepartByUserId(id) {
   })
 }
 
+// kitting箱打包规则特殊导入，不使用blob类型
+export function postImportNoteBlob(data, url,isSpecial) {
+  let _url = isSpecial ? url : url + '/import'
+  return request({
+    url: baseURL + _url,
+    method: 'post',
+    headers: {
+      'Content-Type': 'multipart/form-data;'
+    },
+    data
+  })
+}
+
 // 客户退拆任务-完成 todo
 // export async function productionRecycleJobComplete(id) {
 //   return request({

fe/PC/src/filters/status.js

@@ -2139,6 +2139,10 @@ export function SupplierAsnCtypeStaBack(name){
       value: 3604,
       label: '完工报废'
     },
+    3605:{
+      value: 3605,
+      label: '报废转移'
+    },
     3701: {
       value: 3701,
       label: '线边盘点调整'
@@ -2546,6 +2550,10 @@ export function issueRequestType(index, prop) {
       value: 5,
       label: "Excel导入"
     },
+    6: {
+      value: 6,
+      label: "涂装上线计划"
+    },
   }
   return Enum(type, index, prop)
 }

fe/PC/src/utils/index.js

@@ -616,7 +616,9 @@ export function initInterfaceType(res){
     } else if (item.transType == 38 && (item.transSubType == 3301 || item.transSubType == 3302)) {
       _item.interfaceType = '【TYRP】-【回收料调整单】'
     } else if (item.transType == 36) {
-      _item.interfaceType = '【TYRP】-【报废单、线边仓报废单】'
+      if(item.transSubType != "3605"){
+        _item.interfaceType = '【TYRP】-【报废单、线边仓报废单】'
+      }
     } else {
       _item.interfaceType = ''
     }

fe/PC/src/utils/tableColumns/index.js

@@ -704,7 +704,7 @@ export const Shift = [
   { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" },
 ]
 
-// 供应商自检报告 
+// 作业指导书 
 export const ItemGuideBook = [
   {
     label: _Names.itemCode,
@@ -2318,7 +2318,7 @@ export const InventoryTransferLog =  [
   { label: "从库位代码", prop: "fromLocationCode" },
   { label: "到库位代码", prop: "toLocationCode" },
   { label: "到箱码", prop: "toPackingCode" },
-  { label: "事务类型", prop: "transType", type: "filter", filters: "TransType" },
+  { label: "事务类型", prop: "transType", type: "filter", filters: "TransTypeBase" },
   { label: "子事务类型", prop: "transSubType", type: "filter", filters: "transSubType" },
   { label: "接口对应类型", prop: "interfaceType", width: '360px', showProp: true },
   { label: "从事务编号", prop: "fromTransNumber", width: orderWidth },
@@ -3710,6 +3710,10 @@ export const chassisList =  [
     fixed: "left",
     type: "name"
   },
+  { label: _Names.itemCode, prop: "itemCode" },
+  { label: _Names.itemName, prop: "itemName" },
+  { label: _Names.itemDesc1, prop: "itemDesc1" },
+  { label: _Names.itemDesc2, prop: "itemDesc2" },
   { label: "Wms编号", prop: 'number' },
   { label: "底盘生产时间", prop: 'produceDateTime', type: "dateTime" },
   { label: "接收接口时间", prop: 'receiveInterfaceDateTime', type: "dateTime" },

fe/PC/src/utils/tabsDesTions/index.js

@@ -2523,6 +2523,10 @@ export const chassisList =  [
     fixed: "left",
     type: "name"
   },
+  { label: _Names.itemCode, prop: "itemCode" },
+  { label: _Names.itemName, prop: "itemName" },
+  { label: _Names.itemDesc1, prop: "itemDesc1" },
+  { label: _Names.itemDesc2, prop: "itemDesc2" },
   { label: "Wms编号", prop: 'number' },
   { label: "底盘生产时间", prop: 'produceDateTime', type: "dateTime" },
   { label: "接收接口时间", prop: 'receiveInterfaceDateTime', type: "dateTime" },

fe/PC/src/views/basicData/SupplierManage/Supplier.vue

@@ -217,20 +217,20 @@ export default {
           tableColumns: 'SupplierTimeWindow',
           functionName: 'bySupplierCode'
         },
-        {
+        // {
-          label: "发货单列表",
+        //   label: "发货单列表",
-          name: 'fhdlb',
+        //   name: 'fhdlb',
-          url: 'wms/store/arrive-notice',
+        //   url: 'wms/store/arrive-notice',
-          tableColumns: 'PurchaseReceiptRequest',
+        //   tableColumns: 'PurchaseReceiptRequest',
-          functionName: 'bySupplierCode'
+        //   functionName: 'bySupplierCode'
-        },
+        // },
-        {
+        // {
-          label: "到货单列表",
+        //   label: "到货单列表",
-          name: 'dhdlb',
+        //   name: 'dhdlb',
-          url: 'wms/store/supplier-asn',
+        //   url: 'wms/store/supplier-asn',
-          tableColumns: 'SupplierAsn',
+        //   tableColumns: 'SupplierAsn',
-          functionName: 'bySupplierCode'
+        //   functionName: 'bySupplierCode'
-        }
+        // }
       ]
     };
   },

fe/PC/src/views/basicData/itemGuideBookManage/itemGuideBook.vue

@@ -256,7 +256,7 @@ export default {
                 }
                 fileStorageCreate(params).then( createRes => {
                   that.CreateFormData.pictureBlobName =  createRes
-                  // 创建供应商自检报告接口
+                  // 创建作业指导书接口
                   postCreate(that.CreateFormData, that.URL).then(res => {
                     that.Loading.newAndEdiLoading = false
                     that.FormResult("success")

fe/PC/src/views/kittingManage/Kitting.vue

@@ -52,7 +52,7 @@
       :disabledMethod = {method1:false,method2:false,method3:false}
       :disabledIsAllowPartImport = {isAllowPartImport1:false,isAllowPartImport2:false}
       isAllowPartImportValue="1"
-      @importClick="postImportMergeClick(arguments)"
+      @importClick="postImportAloneClick(arguments)"
       @postImportDown="importDown"
     ></importFile>
     <!-- 搜索按钮——窗体组件 -->
@@ -94,7 +94,7 @@
   </div>
 </template>
 <script>
-import { postCreate,postUpdate } from '@/api/wms-api'
+import { postCreate,postUpdate,postImportNoteBlob } from '@/api/wms-api'
 import { tableMixins } from "@/mixins/TableMixins"
 import { LoadingMixins } from "@/mixins/LoadingMixins"
 import { drawerMixins } from "@/mixins/drawerMixins"
@@ -186,6 +186,70 @@ export default {
     this.paging();
   },
   methods: {
+    //重置表单
+    FormRemove(val) {
+      val[1].resetFields();
+    },
+    // 导入特殊处理
+    postImportAloneClick(val){
+      if (val[0][0] == 0) {
+        this.FormRemove(val[0]);
+        this.displayDialog.importDialog = false;
+      } else {
+        val[0][1].validate((valid) => {
+          if (valid) {
+            let menuName = this.$route.meta.title
+            this.Loading.importLoading = true;
+            let {
+              formFile
+            } = val[1]
+            let fd = new FormData();
+            fd.append("fileType", 1) //文件类型  固定1
+            let methodVal = ''
+            if (val[1].method == '0') {
+              methodVal = 'Update'
+            } else if (val[1].method == '1') {
+              methodVal = 'Append'
+            } else if (val[1].method == '2') {
+              methodVal = 'Replace'
+            }
+            fd.append("method", methodVal) //导入方式 0 更新 1 追加 2 覆盖
+            fd.append("isAllowPartImport", val[1].isAllowPartImport=='0'?true:false) //是否部分错误导入 
+            fd.append("route", this.URL + '/import') //路由 
+            fd.append("function", menuName) //菜单名
+            fd.append("blobName", menuName)
+            fd.append("file", formFile[0])
+            
+            postImportNoteBlob(fd, this.URL).then(res => {
+              // 返回如果是json且code为200，就是为成功，否则就是失败
+              if(typeof res == 'object'  && res.code && res.code == '200'){
+                this.$successMsg('导入成功！')
+                this.Loading.importLoading = false
+                this.FormRemove(val[0]);
+                this.displayDialog.importDialog = false;
+                this.paging()
+              }else{
+                this.importErrHandle(res,val[0])
+              }
+            }).catch(err => {
+              this.importErrHandle(err,val[0])
+            })
+          } else {
+            this.$errorMsg('请按照提示继续操作')
+            this.displayDialog.importDialog = false;
+            return false;
+          }
+        });
+      }
+    },
+    importErrHandle(err,val){
+      console.log('请联系管理员',err)
+      this.$errorMsg('导入过程中发生错误！请联系管理员！')
+      this.Loading.importLoading = false
+      this.FormRemove(val);
+      this.displayDialog.importDialog = false;
+      this.paging()
+    },
     topbuttonHandle(val,item){
       if (val == 'newly') {
         this.CreateForm[0].disabled = false

fe/PC/src/views/rawMaterialManage/quality/InspectRequest.vue

@@ -106,7 +106,7 @@
           </curren-Form>
         </el-col>
         <el-col :span="10" >
-          <div style="padding-bottom:10px">供应商自检报告:</div>
+          <div style="padding-bottom:10px">作业指导书:</div>
           <curren-descriptions
             border
             :column="1"
@@ -471,7 +471,7 @@ export default {
       // supplierHandle: [
       //   { label: "取消", name: "cancel" },
       // ],
-      // 供应商自检报告
+      // 作业指导书
       tabsDesTionsGuideBook:[
         { label: "图片", prop: "pictureBlobName", type: "uploadPictureCard", limit: 1, picExt: ".png,.jpg", },
         { label: "步骤", prop: "step", type:'textarea', rows: 5  },

fe/PC/src/views/rawMaterialManage/quality/InspectRequest_new.vue

@@ -106,7 +106,7 @@
           </curren-Form>
         </el-col>
         <el-col :span="10" >
-          <div style="padding-bottom:10px">供应商自检报告：</div>
+          <div style="padding-bottom:10px">作业指导书：</div>
           <curren-descriptions
             border
             :column="1"
@@ -471,7 +471,7 @@ export default {
       // supplierHandle: [
       //   { label: "取消", name: "cancel" },
       // ],
-      // 供应商自检报告
+      // 作业指导书
       tabsDesTionsGuideBook:[
         { label: "图片", prop: "pictureBlobName", type: "uploadPictureCard", limit: 1, picExt: ".png,.jpg", },
         { label: "步骤", prop: "step", type:'textarea', rows: 5  },

fe/PC/src/views/rawMaterialManage/quality/InspectRequest_old.vue

@@ -104,7 +104,7 @@
           </curren-Form>
         </el-col>
         <el-col :span="10" >
-          <div style="padding-bottom:10px">供应商自检报告：</div>
+          <div style="padding-bottom:10px">作业指导书：</div>
           <curren-descriptions
             border
             :column="1"
@@ -459,7 +459,7 @@ export default {
       // supplierHandle: [
       //   { label: "取消", name: "cancel" },
       // ],
-      // 供应商自检报告
+      // 作业指导书
       tabsDesTionsGuideBook:[
         { label: "图片", prop: "pictureBlobName", type: "uploadPictureCard", limit: 1, picExt: ".png,.jpg", },
         { label: "步骤", prop: "step", type:'textarea', rows: 5  },