1

src/views/goodStore/active/detail.vue

@@ -88,7 +88,12 @@
           </el-collapse>
         </el-tab-pane>
         <el-tab-pane label="审批记录" name="2" v-if="queryType !== 'add'">
-          111
+          <process-time-line
+            v-if="newTime !== ''"
+            :newTime="newTime"
+            :type="'HD'"
+            :orderCode="queryId"
+        />
         </el-tab-pane>
       </el-tabs>
     </div>

src/views/goodStore/goodsCost/detail.vue

@@ -51,7 +51,7 @@
             <process-time-line
             v-if="newTime !== ''"
             :newTime="newTime"
-            :type="'ZXD'"
+            :type="'SPCB'"
             :orderCode="queryId"
           />
         </el-tab-pane>

src/views/goodStore/goodsOnline/detail.vue

@@ -324,7 +324,7 @@
           <process-time-line
             v-if="newTime !== ''"
             :newTime="newTime"
-            :type="'ZXD'"
+            :type="'SPSX'"
             :orderCode="queryId"
         /></el-tab-pane>
       </el-tabs>

src/views/interest/handover/detail.vue

@@ -3,7 +3,6 @@
     <div
       v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
     >
-      <!-- <p>{{ status }}--{{ powers }}</p> -->
       <div class="detail-page-title">
         <span>离职交接记录编号：</span><span v-if="sitem">{{ queryId }}</span>
         <el-button

src/views/process/columns.js

@@ -32,8 +32,6 @@ const routerList = [
     isok: true
   },
 
-
-
   {
     name: "采购单退货流程",
     type: "CGTHD",
@@ -49,6 +47,35 @@ const routerList = [
   },
 
 
+
+  //商品管理
+  {
+    name: "商品成本流程",
+    type: "SPCB",
+    toRouter: "/goodStore/goodsCostDetail",
+    to: "code",
+  },
+  {
+    name: "商品上线流程",
+    type: "SPSX",
+    toRouter: "/goodStore/goodsOnlineDetail",
+    to: "code",
+  },
+  {
+    name: "活动流程",
+    type: "HD",
+    toRouter: "/goodStore/activeDetail",
+    to: "code",
+  },
+  //权限
+  {
+    name: "离职交接流程",
+    type: "LZJJ",
+    toRouter: "/interest/handoverDetail",
+    to: "id",
+  },
+
+
   //销售
   {
     name: "项目流程",
@@ -85,21 +112,20 @@ const routerList = [
     to: "id",
   },
   {
-    name: "发货申请单流程",  //改名字
+    name: "发货申请单流程",
     type: "CKD",
     toRouter: "/sellOut/sellOutOrderDetail",
     to: "code",
   },
-  //咨询订单删除
   {
-    name: "售后申请单流程",
+    name: "销售售后申请单流程",
     type: "SHD",
     toRouter: "/sellOut/sellAfterApplyDetail",
     to: "code",
     isok: true
   },
   {
-    name: "售后退货单流程",  //原来出库退货流程 改为售后退货单流程
+    name: "销售售后退货流程",
     type: "CKTHD",
     toRouter: "/sellOut/returnOrderDetail",
     to: "code",
@@ -113,25 +139,13 @@ const routerList = [
     isok: true
   },
   {
-    name: "销售工差单流程",//原来咨询工差单流程 ,改为销售工差单流程
+    name: "销售工差单流程",
     type: "ZXGCD",
     toRouter: "/sellOut/zxDiffOrderDetail",
     to: "id",
   },
-  //商品管理
-  // {
-  //   name: "销售工差单流程",
-  //   type: "ZXGCD",
-  //   toRouter: "/sellOut/zxDiffOrderDetail",
-  //   to: "id",
-  // },
-  //权限
-  {
-    name: "离职交接流程",
-    type: "LZJJ",
-    toRouter: "/interest/handoverDetail",
-    to: "id",
-  },
+
+
 ];
 const columns = [
   {

src/views/purchaseIn/purchaseOrder/detail.vue

@@ -4,35 +4,13 @@
       style="width: 100%"
       v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
     >
-      <!-- <p>{{ status }}---{{ powers }}</p> -->
-      <div class="detail-page-title">
-        <span>采购单编号：</span
-        ><span
-          >{{ queryId }}
-
-          <!-- ---{{ sitem.bkcode }} -->
-        </span>
-        <tolerance
-          :newTime="newTime"
-          v-if="newTime !== ''"
-          :sitem="sitem"
-          :showBtn="status === '1' && powers.some((item) => item == '082')"
-        />
-        <!-- <el-button
-          type="primary"
-          :size="'mini'"
-          class="fr"
-          style="margin: 0 0 0 12px"
-          @click="diffAdd = true"
-          >填写总工差</el-button
-        > -->
+      <div
+        class="detail-page-title"
+        :showBtn="status === '1' && powers.some((item) => item == '082')"
+      >
+        <span>采购单编号：</span><span>{{ queryId }} </span>
+        <tolerance :newTime="newTime" v-if="newTime !== ''" :sitem="sitem" />
       </div>
-      <!-- <status-bar
-        v-if="newTime !== ''"
-        :newTime="newTime"
-        :options="statusOptions"
-        :status="status"
-      /> -->
       <el-tabs v-model="activeTabs">
         <el-tab-pane label="业务详情" name="1">
           <el-collapse v-model="activeNames" style="margin: -18px 0 0 0">
@@ -82,7 +60,10 @@
                   ></el-tag>
                   <el-tooltip
                     class="fr"
-                    v-if="powers.some((item) => item == '007')&&sitem.status==='0'"
+                    v-if="
+                      powers.some((item) => item == '007') &&
+                      sitem.status === '0'
+                    "
                     effect="dark"
                     content="已于供应商确认"
                     placement="top"
@@ -163,7 +144,12 @@
             <el-collapse-item
               title="工差单"
               name="4"
-              v-if="sitem&&sitem.order_type!=='1'&&sitem.status !== '0' &&sitem.purcheasediff"
+              v-if="
+                sitem &&
+                sitem.order_type !== '1' &&
+                sitem.status !== '0' &&
+                sitem.purcheasediff
+              "
             >
               <work-diff-table
                 :newTime="newTime"
@@ -178,7 +164,7 @@
             v-if="newTime !== ''"
             :newTime="newTime"
             :type="'CGD'"
-            :orderCode="orderCode"
+            :orderCode="queryId"
           />
         </el-tab-pane>
       </el-tabs>
@@ -234,7 +220,6 @@ export default {
       newTime: "",
       loading: false,
       queryId: "",
-      orderCode: "",
       ReturnAddModel: false, //采购单退货弹窗
     };
   },
@@ -260,7 +245,6 @@ export default {
         this.sitem = res.data;
         const { status, can, cgdNo } = this.sitem;
         this.status = status;
-        this.orderCode = cgdNo;
         if (can && can.length > 0) {
           this.sitem.class_cat = "";
           can.forEach((x, i) => {

src/views/purchaseIn/purchaseReturn/detail.vue

@@ -99,7 +99,7 @@
           /> -->
             </el-collapse-item>
 
-            <el-collapse-item
+            <!-- <el-collapse-item
               title="业务审核"
               name="1"
               v-if="status == '1' && powers.some((item) => item == '043')"
@@ -128,7 +128,7 @@
                   >我已知晓</el-button
                 >
               </div>
-            </el-collapse-item>
+            </el-collapse-item> -->
 
             <!-- <el-collapse-item name="3" title="填写退货物流" v-if="status == '2' && powers.some((item) => item == '032')">
           <purchase-back

src/views/purchaseIn/wsmInOrder/detail.vue

@@ -171,7 +171,7 @@
             v-if="newTime !== ''"
             :newTime="newTime"
             :type="'RKD'"
-            :orderCode="orderCode"
+            :orderCode="queryId"
           />
         </el-tab-pane>
       </el-tabs>
@@ -213,7 +213,6 @@ export default {
   data() {
     return {
       activeTabs: "1",
-      orderCode: "",
       ShowDataTableColumns: ShowDataTableColumns,
       activeNames: ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10"],
       order_type_options,
@@ -322,7 +321,6 @@ export default {
         this.sitem = res.data;
         const { status, can, wsm_in_code } = this.sitem;
         this.status = status;
-        this.orderCode = wsm_in_code;
         if (can && can.length > 0) {
           this.sitem.class_cat = "";
           can.forEach((x, i) => {

src/views/sellOut/bargainList/detail.vue

@@ -178,7 +178,7 @@
           <process-time-line
             v-if="newTime !== ''"
             :newTime="newTime"
-            :type="'ZXD'"
+            :type="'YJD'"
             :orderCode="queryId"
           />
         </el-tab-pane>

src/views/sellOut/project/detail.vue

@@ -91,7 +91,7 @@
           <process-time-line
             v-if="newTime !== ''"
             :newTime="newTime"
-            :type="'ZXD'"
+            :type="'PRO'"
             :orderCode="queryId"
           />
         </el-tab-pane>

src/views/sellOut/returnOrder/detail.vue

@@ -87,7 +87,7 @@
             v-if="newTime !== ''"
             :newTime="newTime"
             :type="'CKTHD'"
-            :orderCode="qid"
+            :orderCode="queryId"
           />
         </el-tab-pane>
       </el-tabs>
@@ -159,11 +159,11 @@ export default {
       ],
       newTime: "",
       loading: false,
-      qid: "",
+      queryId: "",
     };
   },
   mounted() {
-    this.qid = this.$route.query.id;
+    this.queryId = this.$route.query.id;
     this.initData();
   },
   methods: {
@@ -186,7 +186,7 @@ export default {
       })
         .then(async () => {
           let _model = {
-            thNo: this.qid,
+            thNo: this.queryId,
             status: type,
             remark: remark,
           };
@@ -209,7 +209,7 @@ export default {
     },
     async initData() {
       let model = {
-        thNo: this.qid,
+        thNo: this.queryId,
       };
       const res = await asyncRequest.detail(model);
       if (res && res.code === 0 && res.data) {

src/views/sellOut/salesOrder/detail.vue

@@ -133,7 +133,7 @@
           <process-time-line
             v-if="newTime !== ''"
             :newTime="newTime"
-            :type="'QRD'"
+            :type="'XSQRD'"
             :orderCode="queryId"
           />
         </el-tab-pane>

src/views/sellOut/sellOutOrder/detail.vue

@@ -271,7 +271,7 @@
             v-if="newTime !== ''"
             :newTime="newTime"
             :type="'CKD'"
-            :orderCode="code"
+            :orderCode="queryId"
           />
         </el-tab-pane>
       </el-tabs>
@@ -440,12 +440,12 @@ export default {
           label: "供应商承担",
         },
       ],
-      code: "",
+      queryId:"",
       did: "", //详情页上的id
     };
   },
   mounted() {
-    this.code = this.$route.query.id;
+    this.queryId = this.$route.query.id;
     this.initData();
   },
   methods: {
@@ -477,7 +477,7 @@ export default {
       this.returnCode = "";
       this.returnCode_type = "";
       let model = {
-        outCode: this.code,
+        outCode: this.queryId,
       };
       const res = await asyncRequest.detail(model);
       if (res && res.code === 0 && res.data) {

src/views/sellOut/sellReturn/detail.vue

@@ -212,7 +212,7 @@
             v-if="newTime !== ''"
             :newTime="newTime"
             :type="'QRTHD'"
-            :orderCode="orderCode"
+            :orderCode="queryId"
           />
         </el-tab-pane>
       </el-tabs>
@@ -269,8 +269,6 @@ export default {
         { id: "4", label: "项目咨询单销售" },
       ],
       sitem: null, //传给组件
-      // --
-      orderCode: "",
       activeNames: ["0", "1", "2", "3", "4", "5"],
       sitem: null,
       status: "", //存储详情接口状态
@@ -290,11 +288,11 @@ export default {
       ],
       newTime: "",
       loading: false,
-      qid: "",
+      queryId: "",
     };
   },
   mounted() {
-    this.qid = this.$route.query.id;
+    this.queryId = this.$route.query.id;
     this.initData();
   },
   methods: {
@@ -354,7 +352,6 @@ export default {
       if (res && res.code === 0 && res.data) {
         this.status = res.data.status;
         this.sitem = res.data;
-        this.orderCode = res.data.returnCode;
         this.getNewTime();
       } else if (res && res.code >= 100 && res.code <= 104) {
         await this.logout();

src/views/sellOut/stockApply/detail.vue

@@ -84,7 +84,7 @@
             v-if="newTime !== ''"
             :newTime="newTime"
             :type="'BHD'"
-            :orderCode="orderCode"
+            :orderCode="queryId"
           />
         </el-tab-pane>
       </el-tabs>
@@ -125,7 +125,6 @@ export default {
   },
   data() {
     return {
-      orderCode: "",
       activeTabs: "0",
       activeNames: ["0", "1", "2", "3", "4"],
       showColumns,

src/views/sellOut/zxDiffOrder/detail.vue

@@ -184,7 +184,6 @@ export default {
         },
       ],
       sitem: null,
-      orderCode: "",
       status: "",
       newTime: "",
       loading: false,