1

src/assets/js/statusList.js

@@ -4,18 +4,20 @@ const statusList = [
 ];
 const cg_order_type_options = [
   { id: "1", label: "备库单" },
-  { id: "2", label: "线上非库存品" },
-  { id: "3", label: "竞价采反" },
-  { id: "4", label: "项目采反" },
-  { id: "5", label: "平台部线上库存品" },
-  { id: "6", label: "平台部线上非库存品" },
+  { id: "2", label: "非库存品" },
+  { id: "3", label: "采反" },
 ]
 const xs_order_type_options = [
-  { id: "1", label: "线上库存品" },
-  { id: "2", label: "线上非库存品" },
-  { id: "3", label: "竞价采反" },
-  { id: "4", label: "项目采反" },
-  { id: "5", label: "平台部线上库存品" },
-  { id: "6", label: "平台部线上非库存品" },
+  { id: "1", label: "库存品" },
+  { id: "2", label: "非库存品" },
+  { id: "3", label: "采反" },
 ]
-export { statusList, cg_order_type_options, xs_order_type_options };
+
+const yw_order_source = [
+  { id: "1", label: "直接下单" },
+  { id: "2", label: "咨询转单" },
+  { id: "3", label: "项目转单" },
+  { id: "4", label: "平台导入" },
+  { id: "5", label: "有赞平台" },
+]
+export { statusList, cg_order_type_options, xs_order_type_options,yw_order_source };

src/views/dataCorrection/cgMessage/index.vue

@@ -418,7 +418,7 @@ export default {
           this.supplierNo = supplierNo || "";
           this.supplier_name = supplier_name || "";
           this.ruleForm.supplierNo = supplierNo ? [supplierNo] : [];
-          if (this.order_type === "1" || this.order_type === "5") {
+          if (this.order_type === "1") {
             this.wsm_supplier = wsm_supplier || "";
             this.wsm_supplierNo = wsm_supplierNo || "";
             this.ruleForm.wsm_supplierNo = wsm_supplierNo
@@ -429,9 +429,9 @@ export default {
             this.ruleForm.wsm_code = wsm_code ? [wsm_code] : [];
           }
           this.rulesThis.wsm_supplierNo[0].required =
-            this.order_type + "" === "1" || this.order_type === "5";
+            this.order_type + "" === "1" ;
           this.rulesThis.wsm_code[0].required =
-            this.order_type + "" === "1" || this.order_type === "5";
+            this.order_type + "" === "1" ;
           this.getNewTime();
         } else if (code >= 100 && code <= 104) {
           await this.logout();

src/views/purchaseIn/purchaseDiffOrder/detail.vue

@@ -237,12 +237,6 @@ export default {
         }
 
         this.getNewTime();
-        // if (this.order_type === "2") {
-        //   this.order_type = res.data.cgdNo;
-        //   this.statusOptions.unshift({ value: "0", label: "竞价单" });
-        // }
-        // this.order_type === "1" ? "CGGCD" : "ZXGCD";
-        // this.order_type = res.data.order_type;
       } else if (res && res.code >= 100 && res.code <= 104) {
         await this.logout();
       } else {

src/views/purchaseIn/purchaseOrder/components/tolerance.vue

@@ -1,6 +1,5 @@
 <template>
   <span>
-    <!-- {{ isshow + "" }}--{{ showBtn + "" }}--{{ order_type + "" }} -->
     <el-button
       v-show="isshow && showBtn && order_type && order_type !== '1'"
       type="primary"
@@ -54,7 +53,7 @@ export default {
     async initData() {
       // console.log("111111");
       let res = {};
-      if (this.order_type === "1" || this.order_type === "2"|| this.order_type === "5" || this.order_type === "6") {
+      if (this.order_type === "1" || this.order_type === "2") {
         res = await asyncRequest.cost_detail({ spuCode: this.spuCode });
       } else {
         res = await asyncRequest.re_detail({ spuCode: this.spuCode });

src/views/purchaseIn/purchaseOrder/detail.vue

@@ -180,7 +180,7 @@
                       show-overflow-tooltip
                     >
                     </el-table-column>
-                     <el-table-column
+                    <el-table-column
                       prop="mobile"
                       label="联系电话"
                       show-overflow-tooltip
@@ -359,13 +359,10 @@ export default {
       }
     },
     async goldPrice() {
-      // console.log(this.sitem.order_type,"11111111111111111111111")
-      // if(this.sitem.order_type){}
-      // return;
       let res = {};
       let { order_type } = this.sitem;
-      console.log( order_type == "6")
-      if (order_type == "1" || order_type == "2" || order_type == "5"|| order_type == "6") {
+      if (
+        order_type == "1" ) {
         res = await asyncRequest.cost_detail({ spuCode: this.sitem.spuCode });
       } else {
         res = await asyncRequest.cove_detail({ spuCode: this.sitem.spuCode });

src/views/purchaseIn/purchaseReturn/components/columns.js

@@ -9,8 +9,6 @@ export default [
     label: "退货单编号",
     width: "160"
   },
-  // {确认单编号}
-  // {order_type类型}
   {
     prop: "apply_name",
     label: "申请人"

src/views/purchaseIn/wsmInOrder/components/wsm-in-order-model.vue

@@ -69,8 +69,7 @@
                     style="width: 100%"
                     :size="'mini'"
                     :disabled="
-                      (sitem && sitem.order_type === '3') ||
-                      (sitem && sitem.order_type === '4')
+                      (sitem && sitem.order_type === '3') 
                     "
                     placeholder="发货方式"
                     @change="sendtypeChange"

src/views/sellOut/returnOrder/index.vue

@@ -233,7 +233,7 @@ export default {
       isDetail: false,
       modelId: 0,
       parmValue: {
-        order_type: "", //订单类型1为销售 2为竞价
+        order_type: "", 
         order_code: "", //销售订单编号
         thNo: "", //退货编号
         out_code: "", //销售出库编号
@@ -336,7 +336,7 @@ export default {
         end: "", //
         status: "", //状态节点
         supplierName:'',
-        order_type: "", //订单类型1为销售 2为竞价
+        order_type: "", 
         page: 1, // 页码
         size: 15, // 每页显示条数
       };

src/views/sellOut/salesOrder/detail.vue

@@ -86,12 +86,7 @@
                 </template>
                 <template slot="is_active">
                   <span
-                    v-if="
-                      sitem.order_type === '1' ||
-                      sitem.order_type === '2' ||
-                      sitem.order_type === '5' ||
-                      sitem.order_type === '6'
-                    "
+                    v-if="sitem.order_type === '1' || sitem.order_type === '2'"
                     ><span
                       >{{
                         sitem.is_activity === "1" ? "参与活动" : "不参与活动"

src/views/sellOut/salesOrder/index.vue

@@ -398,7 +398,7 @@ export default {
       this.input = "";
       this.customerCode = [];
       this.parmValue = {
-        order_type: "", //订单类型1为销售 2为竞价
+        order_type: "", 
         orderCode: "", //销售订单code
         apply_name: "", // 申请人
         good_name: "", // 产品名称

src/views/sellOut/sellReturn/detail.vue

@@ -67,10 +67,7 @@
                   <span
                     v-if="
                       sitem.order_type === '1' ||
-                      sitem.order_type === '2' ||
-                      sitem.order_type === '5' ||
-                      sitem.order_type === '6'
-                    "
+                      sitem.order_type === '2'  "
                     ><span
                       >{{
                         sitem.is_activity === "1" ? "参与活动" : "不参与活动"
@@ -157,9 +154,7 @@
                 sitem &&
                 !(
                   (sitem.order_type === '1' ||
-                    sitem.order_type === '2' ||
-                    sitem.order_type === '5' ||
-                    sitem.order_type === '6') &&
+                    sitem.order_type === '2') &&
                   is_stock === '1'
                 ) &&
                 powers.some((item) => item == '041') &&
@@ -184,9 +179,7 @@
                 (status === '4' || status === '3' || status === '2') &&
                 !(
                   ((sitem && sitem.order_type === '1') ||
-                    sitem.order_type === '2' ||
-                    sitem.order_type === '5' ||
-                    sitem.order_type === '6') &&
+                    sitem.order_type === '2') &&
                   is_stock === '1'
                 )
               "
@@ -214,9 +207,7 @@
                 status === '3' &&
                 !(
                   (sitem.order_type === '1' ||
-                    sitem.order_type === '2' ||
-                    sitem.order_type === '5' ||
-                    sitem.order_type === '6') &&
+                    sitem.order_type === '2') &&
                   is_stock === '1'
                 )
               "