Merge branch 'dev_web' of http://dev.ccwin-in.com:3000/BoXu.Zheng/WZC2 into dev_web

fe/PC/src/filters/options.js

@@ -196,7 +196,7 @@ export function Roles(val){
     // "CountPlan": "盘点计划",
     // "CountNote": "盘点记录",
     // "CountAdjustNote": "盘点差异调整记录",
-    // "InspectNotice": "报检单",
+    // "InspectRequest": "报检单",
     // "InspectNote": "检验记录",
     // "InspectAbnormalNote": "质量异常记录",
     // "ProductRecycleNote": "成品回收记录",

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

@@ -210,7 +210,7 @@ export const PurchaseReceiptJob =  [
   // -----------------------------------------------------------------------
 ]
 // 报检单 已调整
-export const InspectNotice =  [
+export const InspectRequest =  [
   { label: "物品代码", prop: "itemCode", fixed: "left" },
   { label: "物品名称", prop: "itemName", width: orderWidth },
   { label: "物品描述", prop: "itemDesc1" },

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

@@ -9,7 +9,7 @@
 // 原料管理
 /**/
 // 报检单
-export const InspectNotice = {
+export const InspectRequest = {
   // action:"==",//默认等于
   prop:'asnNumber',
   placeholder:'请输入发货单号',

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

@@ -4,7 +4,7 @@ const orderWidth = 180
 // 原料管理
 /**/
 // 报检单 已调整
-export const InspectNotice =  [
+export const InspectRequest =  [
   // { label: "检验详情", fixed: "left", type: "button" },
   { label: "物品代码", prop: "itemCode" },
   { label: "物品名称", prop: "itemName" },

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

@@ -1438,7 +1438,7 @@ export const lackMaterialsInfo = [
   { label: "status", prop: 'status' },
 ]
 // 报检单 已调整
-export const InspectNotice =  [
+export const InspectRequest =  [
   {
     label: "检验单号",
     prop: "number",

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

@@ -984,7 +984,7 @@ export const PurchaseReceiptNote =  [
   // -----------------------------------------------------------------------
 ]
 // 报检单 已调整 20221220
-export const InspectNotice = [
+export const InspectRequest = [
   { label: "检验单号", prop: "number" },
   { label: "状态", prop: "jobStatus", type: "filter", filters: "jobStatus" },
   { label: "创建时间", prop: "creationTime",type: "dateTime" },

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

@@ -232,7 +232,7 @@ import { mixins } from "@/mixins/mixins"
 import currenDescriptions from "@/components/currenDescriptions"
 import pdf from "@/components/pdf"
 export default {
-  name: "InspectNotice",
+  name: "InspectRequest",
   mixins: [
     tableMixins,
     LoadingMixins,
@@ -246,7 +246,7 @@ export default {
   },
   data () {
     return {
-      URL: 'wms/job/inspect-job',
+      URL: 'wms/store/inspect-request',
       // tab标签值
       currentTagName:'hz',
       uploadShow: false,