Merge branch 'sit'

src/views/interest/action/index.vue

@@ -218,7 +218,7 @@ import asyncRequest from "@/apis/service/interest/action";
 import resToken from "@/mixins/resToken";
 export default {
   name: "Action",
-  mixins:[resToken],
+  mixins: [resToken],
   data() {
     return {
       ruleForm: {},
@@ -235,6 +235,7 @@ export default {
       action_data: [], // 字段数据
       action: [], // 功能数据
       private_data: [], //私有数据菜单ID
+      private_field: [],
     };
   },
   computed: {
@@ -419,6 +420,7 @@ export default {
           action: this.action,
           action_data: this.action_data,
           private_data: arr,
+          private_field: this.private_field,
         };
 
         const loadding = this.$loading();
@@ -430,7 +432,7 @@ export default {
           });
         } else if (res && res.code >= 100 && res.code <= 104) {
           await this.logout();
-        }else{
+        } else {
           this.$message.warning(res.message);
         }
         loadding.close();
@@ -464,10 +466,12 @@ export default {
         } else {
           this.private_data = [];
         }
+        this.private_field = resD.private_field;
+        console.log(this.private_field);
         this.refreshRoleCheckAllStatus();
       } else if (res && res.code >= 100 && res.code <= 104) {
         await this.logout();
-      }else{
+      } else {
         this.$message.warning(res.message);
       }
       this.isBtnDisabled = false;
@@ -480,7 +484,7 @@ export default {
         await this.initRoleList();
       } else if (res && res.code >= 100 && res.code <= 104) {
         await this.logout();
-      }else{
+      } else {
         this.$message.warning(res.message);
       }
     },
@@ -493,7 +497,7 @@ export default {
           await this.switchRoleHandle(this.roleList[0]);
         } else if (res && res.code >= 100 && res.code <= 104) {
           await this.logout();
-        }else{
+        } else {
           this.$message.warning(res.message);
         }
       }

src/views/purchaseIn/purchaseDiffOrder/ShowDataTableColumns.js

@@ -41,6 +41,23 @@ export default [
     label: "实时金价",
     span: 6
   },
+  {
+    prop: "is_act",
+    label: "客户反馈",
+    _slot_: "is_act",
+    span: 6
+  },
+  {
+    prop: "customer_remark",
+    label: "客户意愿",
+    _slot_: "customer_remark",
+    span: 6
+  },
+  {
+    prop: "remark",
+    label: "业务审核备注",
+    span: 12
+  },
 
 
 

src/views/purchaseIn/purchaseDiffOrder/detail.vue

@@ -1,11 +1,9 @@
 <template>
   <div class="purchaseDiffOrderDetail pagePadding">
-    
     <div
       style="width: 100%"
       v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
     >
-   
       <!-- <div class="detail-page-title">
         <span>采购工差单编号：</span><span v-if="sitem">{{ sitem.id }}</span>
       </div> -->
@@ -38,46 +36,43 @@
                     "
                   ></el-tag>
                 </template>
+                <template slot="order_type">
+                  <el-tag
+                    :size="'mini'"
+                    v-text="
+                      (
+                        order_type_options.find(
+                          (item) => item.value === sitem.order_type
+                        ) || {}
+                      ).label || '--'
+                    "
+                  ></el-tag>
+                </template>
+                <!-- <template slot="order_type">
+                  <el-tag
+                    :size="'mini'"
+                    v-text="
+                      (
+                        order_type_options.find(
+                          (item) => item.value === sitem.order_type
+                        ) || {}
+                      ).label || '--'
+                    "
+                  ></el-tag>
+                </template> -->
+
+                
               </show-data-table>
-              <!-- <purchase-order-addEdit
-            style="padding: 0 0 20px 0"
-            :newTime="newTime"
-            v-if="newTime !== ''"
-            :sitem="sitem"
-            :id="queryId"
-            @refresh="initData()"
-          /> -->
-            </el-collapse-item>
-            <!-- && status === '3' -->
-            <el-collapse-item
-              title="通知采购部门"
-              name="1"
-              v-if="status === '2' && powers.some((item) => item == '038')"
-            >
-              <div style="height: 50px; padding: 0 0px 20px 0">
-                <el-button
-                  type="primary"
-                  class="fr"
-                  size="mini"
-                  @click="statusConfirm('3', '确定我已知晓并同意')"
-                  >我已知晓</el-button
-                >
-              </div>
             </el-collapse-item>
-            <el-collapse-item
-              title="通知财务部门"
-              name="2"
-              v-if="status === '3' && powers.some((item) => item == '039')"
-            >
-              <div style="height: 50px; padding: 0 0px 20px 0">
-                <el-button
-                  type="primary"
-                  class="fr"
-                  size="mini"
-                  @click="statusConfirm('4', '确定我已知晓并同意')"
-                  >我已知晓</el-button
-                >
-              </div>
+            <el-collapse-item title="商品信息" name="2">
+              <show-goods-data-table
+                :newTime="newTime"
+                v-if="newTime !== ''"
+                :type="sitem.order_type"
+                :skucode="sitem.skuCode"
+                :spucode="sitem.good_code"
+                :iscgd="true"
+              />
             </el-collapse-item>
           </el-collapse>
         </el-tab-pane>
@@ -134,6 +129,21 @@ export default {
         { id: "1", label: "待业务部门审核" },
         { id: "2", label: "工差单审核完成" },
       ],
+      order_type_options: [
+        {
+          value: "1",
+          label: "备货单",
+        },
+        {
+          value: "2",
+          label: "线上非库存品",
+        },
+        {
+          value: "3",
+          label: "咨询采返",
+        },
+        { value: "4", label: "项目采返" },
+      ],
       finishStatus: "finish",
       activeNames: ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9"],
       sitem: null,

src/views/sellOut/sellOutOrder/detail.vue

@@ -122,12 +122,18 @@
                       @click="agree_return"
                     ></i>
                   </el-tooltip>
-                  <!-- resitem.status === '3'   v-if="resitem.is_receive === '0'"-->
+
                   <el-tooltip
                     class="fr"
                     effect="dark"
                     content="取消申请"
                     style="padding: 3px 0 0 0"
+                    v-if="
+                      resitem.status === '1' ||
+                      resitem.status === '2' ||
+                      resitem.status === '3' ||
+                      resitem.status === '4'
+                    "
                     placement="top"
                   >
                     <i
@@ -426,7 +432,7 @@ export default {
               title: "退货成功",
               message: "",
             });
-            this.searchList();
+            await this.initData();
           } else if (res && res.code >= 100 && res.code <= 104) {
             await this.logout();
           } else {

src/views/sellOut/zxDiffOrder/columns.js

@@ -67,12 +67,23 @@ const showColumns = [
     label: "订单编号",
     span: 6
   },
+  {
+    prop: "order_type",
+    label: "工差单状态",
+    _slot_: "order_type",
+    span: 6
+  },
   {
     prop: "status",
     label: "工差单状态",
     _slot_: "status",
     span: 6
   },
+  {
+    prop: "addtime",
+    label: "创建时间",
+    span: 6
+  },
 
 
   {
@@ -90,5 +101,22 @@ const showColumns = [
     label: "金价",
     span: 6
   },
+  {
+    prop: "is_act",
+    label: "客户反馈",
+    _slot_: "is_act",
+    span: 6
+  },
+  {
+    prop: "customer_remark",
+    label: "客户意愿",
+    _slot_: "customer_remark",
+    span: 6
+  },
+  {
+    prop: "remark",
+    label: "业务审核备注",
+    span: 18
+  },
 ]
 export { columns, showColumns }

src/views/sellOut/zxDiffOrder/detail.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="zxDiffOrderDetail pagePadding">
-    <div>{{ status }}---{{ powers }}</div>
+    <!-- <div>{{ status }}---{{ powers }}</div> -->
     <div
       style="width: 100%"
       v-if="powers && powers.length > 0 && powers.some((item) => item == '007')"
@@ -37,7 +37,7 @@
                     "
                   ></el-tag>
                 </template>
-                <!--<template slot="order_type">
+                <template slot="order_type">
                   <el-tag
                     :size="'mini'"
                     v-text="
@@ -49,60 +49,55 @@
                     "
                   ></el-tag>
                 </template>
-                
-
-                <template slot="supplierName">
-                  <span>{{ sitem.supplierName }}</span>
-                  <el-popover placement="top" width="300" trigger="hover">
-                    <ul>
-                      <li>
-                        <span>销售方公司编号：</span
-                        ><span>{{ sitem.supplierNo }}</span>
-                      </li>
-                    </ul>
-                    <i class="el-icon-warning-outline fr" slot="reference"></i>
-                  </el-popover>
-                </template>
-                <template slot="companyName">
-                  <span>{{ sitem.companyName }}</span>
-                  <el-popover placement="top" width="300" trigger="hover">
-                    <ul>
-                      <li>
-                        <span>购买方公司编号：</span
-                        ><span>{{ sitem.companyNo }}</span>
-                      </li>
-                    </ul>
-                    <i class="el-icon-warning-outline fr" slot="reference"></i>
-                  </el-popover>
+                <template slot="is_act">
+                  <el-tag
+                    :size="'mini'"
+                    v-text="
+                      (
+                        is_act_options.find(
+                          (item) => item.value == sitem.is_act
+                        ) || {}
+                      ).label || '--'
+                    "
+                  ></el-tag>
                 </template>
-                <template slot="is_active">
-                  <span v-if="sitem.order_type === '1'"
-                    ><span
-                      >{{
-                        sitem.is_activity === "1" ? "参与活动" : "不参与活动"
-                      }}/{{ sitem.good_type }}</span
-                    ></span
-                  >
-                  <span v-else>--</span>
+                <template slot="customer_remark">
+                  
+                  <el-tag
+                    :size="'mini'"
+                    v-if="sitem.is_act==='1'"
+                    v-text="
+                      (
+                        customer_remark_options.find(
+                          (item) => item.value == sitem.customer_remark
+                        ) || {}
+                      ).label || '--'
+                    "
+                  ></el-tag>
+                   <el-tag
+                    :size="'mini'"
+                    v-else
+                    v-text=" '--'
+                    "
+                  ></el-tag>
                 </template>
-                <template slot="send_type">
-                  <el-tag :size="'mini'">{{
-                    sitem.send_type === "1"
-                      ? "直接发货"
-                      : sitem.send_type === "2"
-                      ? "延迟发货"
-                      : "--"
-                  }}</el-tag> -->
-                <!-- </template> -->
               </show-data-table>
-              <!-- <show-form
-            :newTime="newTime"
-            v-if="newTime !== ''"
-            :sitem="sitem"
-            :id="queryId"
-          /> -->
             </el-collapse-item>
-            <el-collapse-item title="业务审核" name="2">
+            <el-collapse-item title="商品信息" name="2">
+              <show-goods-data-table
+                :newTime="newTime"
+                v-if="newTime !== ''"
+                :type="sitem.order_type"
+                :skucode="sitem.skuCode"
+                :spucode="sitem.good_code"
+                :iscgd="true"
+              />
+            </el-collapse-item>
+            <el-collapse-item
+              title="业务审核"
+              name="3"
+              v-if="sitem && sitem.status === '1'"
+            >
               <add-form
                 :sitem="sitem"
                 :newTime="newTime"
@@ -162,6 +157,32 @@ export default {
         { value: "1", label: "待业务部门审核" },
         { value: "2", label: "审批已完成" },
       ],
+      orderOptions: [
+        { id: "1", label: "线上商品销售" },
+        { id: "2", label: "项目线上商品销售" },
+        { id: "3", label: "咨询单销售" },
+        { id: "4", label: "项目咨询单销售" },
+      ],
+      customer_remark_options: [
+        {
+          value: "1",
+          label: "咨询订单减工差",
+        },
+        {
+          value: "2",
+          label: "咨询订单不减工差",
+        },
+      ],
+      is_act_options: [
+        {
+          value: "1",
+          label: "接受工差",
+        },
+        {
+          value: "2",
+          label: "不接受工差-退回重做",
+        },
+      ],
       sitem: null,
       orderCode: "",
       status: "",