Merge branch 'sit' into dev

src/assets/js/statusList.js

@@ -7,5 +7,6 @@ const order_type_options = [
   { id: "2", label: "项目线上商品销售" },
   { id: "3", label: "咨询单销售" },
   { id: "4", label: "项目咨询单销售" },
+  { id: "5", label: "平台部订单销售" },
 ]
 export { statusList, order_type_options };

src/components/globalComponents/show-goods-data-table/main.vue

@@ -2,7 +2,7 @@
   <div class="showGoodsDataTable" v-loading="loading">
     <show-data-table
       v-if="
-        (type === '1' || type === '2') &&
+        (type === '1' || type === '2'|| type === '5') &&
         this.sitem &&
         this.sitem.addtime &&
         !iscgd
@@ -130,7 +130,7 @@
     </show-data-table>
     <show-data-table
       v-else-if="
-        (type === '1' || type === '2') &&
+        (type === '1' || type === '2'|| type === '5') &&
         this.sitem &&
         this.sitem.addtime &&
         iscgd
@@ -498,7 +498,7 @@ export default {
       this.loading = true;
       if (this.type) {
         let res = {};
-        if (this.type === "1" || this.type === "2") {
+        if (this.type === "1" || this.type === "2"|| this.type === "5") {
           if (this.iscgd) {
             res = await asyncRequest.cost_detail({
               spuCode: this.spucode,

src/views/orderEntry/orderConfirm/index.vue

@@ -58,12 +58,16 @@
             <div class="tab-item-main">
               <el-row class="tab-title">
                 <el-col :span="4">
-                  <div>{{ importSitem.platform_code }}</div>
-                  <div>{{ importSitem.po_code }}</div>
+                  <div style="min-height: 26px">
+                    {{ importSitem.platform_code }}
+                  </div>
+                  <div style="min-height: 26px">{{ importSitem.po_code }}</div>
                 </el-col>
                 <el-col :span="9">
-                  <div>{{ confirmSitem.platform_code }}</div>
-                  <div>{{ confirmSitem.po_code }}</div>
+                  <div style="min-height: 26px">
+                    {{ confirmSitem.platform_code }}
+                  </div>
+                  <div style="min-height: 26px">{{ confirmSitem.po_code }}</div>
                 </el-col>
                 <el-col :span="11" class="nop">
                   <el-row>
@@ -72,7 +76,12 @@
                         <el-input
                           v-model="ruleForm.platform_code"
                           maxlength="100"
-                          :disabled="!(status === '2'&& powers.some((item) => item == '008'))"
+                          :disabled="
+                            !(
+                              status === '2' &&
+                              powers.some((item) => item == '008')
+                            )
+                          "
                           placeholder="平台订单号"
                         /> </el-form-item
                     ></el-col>
@@ -82,7 +91,12 @@
                         <el-input
                           v-model="ruleForm.po_code"
                           maxlength="100"
-                          :disabled="!(status === '2'&& powers.some((item) => item == '008'))"
+                          :disabled="
+                            !(
+                              status === '2' &&
+                              powers.some((item) => item == '008')
+                            )
+                          "
                           placeholder="其他单号"
                         />
                       </el-form-item>
@@ -100,12 +114,20 @@
             <div class="tab-item-main">
               <el-row class="tab-title">
                 <el-col :span="4">
-                  <div>{{ importSitem.platform_time }}</div>
-                  <div>{{ importSitem.plat_code }}</div>
+                  <div style="min-height: 26px">
+                    {{ importSitem.platform_time }}
+                  </div>
+                  <div style="min-height: 26px">
+                    {{ importSitem.plat_code }}
+                  </div>
                 </el-col>
                 <el-col :span="9"
-                  ><div>{{ confirmSitem.platform_time }}</div>
-                  <div>{{ confirmSitem.plat_code }}</div>
+                  ><div style="min-height: 26px">
+                    {{ confirmSitem.platform_time }}
+                  </div>
+                  <div style="min-height: 26px">
+                    {{ confirmSitem.plat_code }}
+                  </div>
                   <div v-if="conGoodData && conGoodData.good_thumb_img">
                     <show-data-table
                       :sitem="conGoodData"
@@ -217,7 +239,12 @@
                           v-model="ruleForm.platform_time"
                           style="width: 100%"
                           value-format="yyyy-MM-dd HH:mm:ss"
-                          :disabled="!(status === '2'&& powers.some((item) => item == '008'))"
+                          :disabled="
+                            !(
+                              status === '2' &&
+                              powers.some((item) => item == '008')
+                            )
+                          "
                           :picker-options="pickerOptions"
                           @change="selectTime"
                         >
@@ -229,7 +256,12 @@
                           v-model="ruleForm.plat_code"
                           maxlength="100"
                           readonly
-                          :disabled="!(status === '2'&& powers.some((item) => item == '008'))"
+                          :disabled="
+                            !(
+                              status === '2' &&
+                              powers.some((item) => item == '008')
+                            )
+                          "
                           @focus="showModel = true"
                           placeholder="平台商品编号"
                       /></el-form-item>
@@ -358,12 +390,16 @@
             <div class="tab-item-main">
               <el-row class="tab-title">
                 <el-col :span="4">
-                  <div>{{ importSitem.mode }}</div>
-                  <div>{{ importSitem.sale_source }}</div>
+                  <div style="min-height: 26px">{{ importSitem.mode }}</div>
+                  <div style="min-height: 26px">
+                    {{ importSitem.sale_source }}
+                  </div>
                 </el-col>
                 <el-col :span="9">
-                  <div>{{ confirmSitem.mode }}</div>
-                  <div>{{ confirmSitem.sale_source }}</div></el-col
+                  <div style="min-height: 26px">{{ confirmSitem.mode }}</div>
+                  <div style="min-height: 26px">
+                    {{ confirmSitem.sale_source }}
+                  </div></el-col
                 >
                 <el-col :span="11" class="nop">
                   <el-row>
@@ -373,7 +409,12 @@
                           v-model="ruleForm.mode"
                           style="width: 100%"
                           clearable
-                          :disabled="!(status === '2'&& powers.some((item) => item == '008'))"
+                          :disabled="
+                            !(
+                              status === '2' &&
+                              powers.some((item) => item == '008')
+                            )
+                          "
                           placeholder="收费模式"
                         >
                           <el-option
@@ -392,7 +433,12 @@
                           v-model="ruleForm.sale_source"
                           style="width: 100%"
                           clearable
-                          :disabled="!(status === '2'&& powers.some((item) => item == '008'))"
+                          :disabled="
+                            !(
+                              status === '2' &&
+                              powers.some((item) => item == '008')
+                            )
+                          "
                           placeholder="销售渠道"
                         >
                           <el-option
@@ -415,18 +461,18 @@
             <div class="tab-item-main">
               <el-row class="tab-title">
                 <el-col :span="4">
-                  <div>
+                  <div style="min-height: 26px">
                     {{ importSitem.contactor }}
                   </div>
-                  <div>
+                  <div style="min-height: 26px">
                     {{ importSitem.mobile }}
                   </div>
                 </el-col>
                 <el-col :span="9">
-                  <div>
+                  <div style="min-height: 26px">
                     {{ confirmSitem.contactor }}
                   </div>
-                  <div>
+                  <div style="min-height: 26px">
                     {{ confirmSitem.mobile }}
                   </div></el-col
                 >
@@ -437,7 +483,12 @@
                         <el-input
                           v-model="ruleForm.contactor"
                           maxlength="100"
-                          :disabled="!(status === '2'&& powers.some((item) => item == '008'))"
+                          :disabled="
+                            !(
+                              status === '2' &&
+                              powers.some((item) => item == '008')
+                            )
+                          "
                           placeholder="收货人"
                         />
                       </el-form-item>
@@ -447,7 +498,12 @@
                         <el-input
                           v-model="ruleForm.mobile"
                           maxlength="100"
-                          :disabled="!(status === '2'&& powers.some((item) => item == '008'))"
+                          :disabled="
+                            !(
+                              status === '2' &&
+                              powers.some((item) => item == '008')
+                            )
+                          "
                           placeholder="收货电话"
                         />
                       </el-form-item>
@@ -467,13 +523,15 @@
               <el-row class="tab-title">
                 <el-col :span="4">
                   <div style="min-height: 26px">&nbsp;</div>
-                  <div>{{ importSitem.addr }}</div></el-col
+                  <div style="min-height: 26px">
+                    {{ importSitem.addr }}
+                  </div></el-col
                 >
                 <el-col :span="9">
                   <div style="min-height: 26px">
                     {{ confirmSitem.addr_name }}&nbsp;
                   </div>
-                  <div>{{ confirmSitem.addr }}</div>
+                  <div style="min-height: 26px">{{ confirmSitem.addr }}</div>
                 </el-col>
                 <el-col :span="11" class="nop">
                   <el-row>
@@ -482,7 +540,12 @@
                         <select-area
                           :value="ruleForm.addr_code"
                           :size="'mini'"
-                          :disabled="!(status === '2'&& powers.some((item) => item == '008'))"
+                          :disabled="
+                            !(
+                              status === '2' &&
+                              powers.some((item) => item == '008')
+                            )
+                          "
                           placeholder="收货省市区"
                           @selectChange="select_area_change($event)"
                         />
@@ -493,7 +556,12 @@
                         <el-input
                           v-model="ruleForm.addr"
                           maxlength="100"
-                          :disabled="!(status === '2'&& powers.some((item) => item == '008'))"
+                          :disabled="
+                            !(
+                              status === '2' &&
+                              powers.some((item) => item == '008')
+                            )
+                          "
                           placeholder="详细地址"
                         />
                       </el-form-item>
@@ -510,14 +578,22 @@
             </div>
             <div class="tab-item-main">
               <el-row class="tab-title">
-                <el-col :span="4">{{ importSitem.order_remark }}</el-col>
-                <el-col :span="9">{{ confirmSitem.order_remark }}</el-col>
+                <el-col :span="4" style="min-height: 26px">{{
+                  importSitem.order_remark
+                }}</el-col>
+                <el-col :span="9" style="min-height: 26px">{{
+                  confirmSitem.order_remark
+                }}</el-col>
                 <el-col :span="11">
                   <el-form-item prop="order_remark">
                     <el-input
                       v-model="ruleForm.order_remark"
                       maxlength="100"
-                      :disabled="!(status === '2'&& powers.some((item) => item == '008'))"
+                      :disabled="
+                        !(
+                          status === '2' && powers.some((item) => item == '008')
+                        )
+                      "
                       placeholder="订单备注" /></el-form-item
                 ></el-col>
               </el-row>
@@ -532,12 +608,12 @@
             <div class="tab-item-main">
               <el-row class="tab-title">
                 <el-col :span="4">
-                  <div>{{ importSitem.num }}</div>
-                  <div>{{ importSitem.price }}</div>
+                  <div style="min-height: 26px">{{ importSitem.num }}</div>
+                  <div style="min-height: 26px">{{ importSitem.price }}</div>
                 </el-col>
                 <el-col :span="9">
-                  <div>{{ confirmSitem.num }}</div>
-                  <div>{{ confirmSitem.price }}</div>
+                  <div style="min-height: 26px">{{ confirmSitem.num }}</div>
+                  <div style="min-height: 26px">{{ confirmSitem.price }}</div>
                 </el-col>
                 <el-col :span="11" class="nop">
                   <el-row>
@@ -553,7 +629,12 @@
                           :size="'mini'"
                           :controls="false"
                           :append="''"
-                          :disabled="!(status === '2'&& powers.some((item) => item == '008'))"
+                          :disabled="
+                            !(
+                              status === '2' &&
+                              powers.some((item) => item == '008')
+                            )
+                          "
                           @reschange="number_change($event, 'num')"
                         />
                       </el-form-item>
@@ -564,7 +645,12 @@
                           :values="ruleForm.price"
                           :placeholder="'单价'"
                           :min="price_min"
-                          :disabled="!(status === '2'&& powers.some((item) => item == '008'))"
+                          :disabled="
+                            !(
+                              status === '2' &&
+                              powers.some((item) => item == '008')
+                            )
+                          "
                           :max="100000000000"
                           :position="'right'"
                           :precision="2"
@@ -587,15 +673,23 @@
             </div>
             <div class="tab-item-main">
               <el-row class="tab-title">
-                <el-col :span="4">{{ importSitem.activity_name }}</el-col>
-                <el-col :span="9">{{ confirmSitem.activity_name }}</el-col>
+                <el-col :span="4" style="min-height: 26px">{{
+                  importSitem.activity_name
+                }}</el-col>
+                <el-col :span="9" style="min-height: 26px">{{
+                  confirmSitem.activity_name
+                }}</el-col>
                 <el-col :span="11">
                   <el-form-item prop="activity_code">
                     <el-select
                       v-model="ruleForm.activity_code"
                       style="width: 100%"
                       clearable
-                      :disabled="!(status === '2'&& powers.some((item) => item == '008'))"
+                      :disabled="
+                        !(
+                          status === '2' && powers.some((item) => item == '008')
+                        )
+                      "
                       @change="get_new_price"
                       placeholder="活动名称"
                     >
@@ -618,19 +712,22 @@
             </div>
             <div class="tab-item-main">
               <el-row class="tab-title">
-                <el-col :span="4">{{
+                <el-col :span="4" style="min-height: 26px">{{
                   importSitem.before_discount_all_price
                 }}</el-col>
-                <el-col :span="9">{{
+                <el-col :span="9" style="min-height: 26px">{{
                   confirmSitem.before_discount_all_price
                 }}</el-col>
-                <el-col :span="11">
+                <el-col :span="11" style="min-height: 26px">
                   {{ ruleForm.before_discount_all_price }}</el-col
                 >
               </el-row>
             </div>
           </div>
-          <div class="tab-row" v-if="status === '2'&& powers.some((item) => item == '008')">
+          <div
+            class="tab-row"
+            v-if="status === '2' && powers.some((item) => item == '008')"
+          >
             <div class="tab-item-label">
               <label style="color: transparent">*</label>
             </div>
@@ -926,18 +1023,23 @@ export default {
         if (
           !(this.status === "3" || this.status === "4" || this.status === "5")
         ) {
+          console.log(this.status);
           this.subSitem = confirm ? JSON.parse(JSON.stringify(confirm)) : null;
         } else {
           this.subSitem = user_update
             ? JSON.parse(JSON.stringify(user_update))
             : null;
         }
-        // console.log(this.status);
+
         if (this.confirmSitem && this.confirmSitem.plat_code) {
           await this.onlineData(1, this.confirmSitem.plat_code);
         }
-        if (this.subSitem && this.subSitem.plat_code) {
-          await this.onlineData(2, this.subSitem.plat_code);
+        if (this.subSitem && this.subSitem.platform_code) {
+          const { plat_code } = this.subSitem;
+          if (plat_code) {
+            await this.onlineData(2, plat_code);
+          }
+
           await this.againForm(this.subSitem);
         }
 
@@ -960,8 +1062,8 @@ export default {
         } else {
           this.subGoodData = data;
           const { platform_name } = data;
-          if (this.status !== '2') {
-            this.sitem.platform_name = platform_name+'客户';
+          if (this.status !== "2") {
+            this.sitem.platform_name = platform_name + "客户";
           }
         }
       } else if (code >= 100 && code <= 104) {

src/views/sellOut/salesOrder/components/order-out-table.vue

@@ -147,7 +147,7 @@
             effect="dark"
             content="退货"
             class="fr"
-            v-if="is_return && powers.some((item) => item == '048')"
+            v-if="is_return && powers.some((item) => item == '051')"
             placement="top"
           >
             <i

src/views/sellOut/salesOrder/detail.vue

@@ -199,6 +199,7 @@ export default {
         { id: "2", label: "项目线上商品销售" },
         { id: "3", label: "咨询单销售" },
         { id: "4", label: "项目咨询单销售" },
+        { id: "5", label: "平台部订单销售" },
       ],
       statusOptions: [
         { value: "0", label: "待发货" },

src/views/sellOut/salesOrder/index.vue

@@ -129,7 +129,7 @@
                   clearable
                   placeholder="关键字"
                   v-model="input"
-                   maxlength="40"
+                  maxlength="40"
                   :size="searchSize"
                   @blur="searchList"
                   class="input-with-select"
@@ -305,6 +305,7 @@ export default {
         { id: "2", label: "项目线上商品销售" },
         { id: "3", label: "咨询单销售" },
         { id: "4", label: "项目咨询单销售" },
+        { id: "5", label: "平台部订单销售" },
       ],
       loading: false,
       showModel: false,
@@ -433,7 +434,7 @@ export default {
       await this.searchList();
     },
     async searchList() {
-       if (
+      if (
         (this.parmValue.start !== "" && this.parmValue.end === "") ||
         (this.parmValue.start === "" && this.parmValue.end !== "")
       ) {

src/views/sellOut/sellAfterApply/detail.vue

@@ -176,6 +176,7 @@ export default {
         { id: "2", label: "项目线上商品销售" },
         { id: "3", label: "咨询单销售" },
         { id: "4", label: "项目咨询单销售" },
+        { id: "5", label: "平台部订单销售" },
       ],
       activeTabs: "1",
       expect_options: [],

src/views/sellOut/sellOutOrder/detail.vue

@@ -375,6 +375,7 @@ export default {
         { id: "2", label: "项目线上商品销售" },
         { id: "3", label: "咨询单销售" },
         { id: "4", label: "项目咨询单销售" },
+        { id: "5", label: "平台部订单销售" },
       ],
       statusOptions: [
         { value: "0", label: "待采购备货" },

src/views/sellOut/sellOutOrder/index.vue

@@ -215,6 +215,7 @@ export default {
         { id: "2", label: "项目线上商品销售" },
         { id: "3", label: "咨询单销售" },
         { id: "4", label: "项目咨询单销售" },
+        { id: "5", label: "平台部订单销售" },
       ],
       // post_ownOptions: [
       //   { id: "1", label: "客户承担" },

src/views/sellOut/sellReturn/detail.vue

@@ -143,14 +143,16 @@
                 :iscgd="false"
               />
             </el-collapse-item>
-
             <el-collapse-item
               title="业务审核"
               name="3"
               v-if="
+                !(
+                  (sitem.order_type === '1' || sitem.order_type === '2') &&
+                  is_stock === '1'
+                ) &&
                 sitem &&
-                sitem.order_type !== '1' &&
-                powers.some((item) => item == '043') &&
+                powers.some((item) => item == '041') &&
                 status === '1'
               "
             >
@@ -169,8 +171,11 @@
               name="4"
               v-if="
                 sitem &&
-                sitem.order_type !== '1' &&
-                (status === '4' || status === '3' || status === '2')
+                (status === '4' || status === '3' || status === '2') &&
+                !(
+                  (sitem.order_type === '1' || sitem.order_type === '2') &&
+                  is_stock === '1'
+                )
               "
             >
               <com-exam-form
@@ -192,9 +197,12 @@
               name="5"
               v-if="
                 sitem &&
-                sitem.order_type !== '1' &&
                 powers.some((item) => item == '036') &&
-                status === '3'
+                status === '3' &&
+                !(
+                  (sitem.order_type === '1' || sitem.order_type === '2') &&
+                  is_stock === '1'
+                )
               "
             >
               <exam-form
@@ -268,6 +276,7 @@ export default {
         { id: "2", label: "项目线上商品销售" },
         { id: "3", label: "咨询单销售" },
         { id: "4", label: "项目咨询单销售" },
+        { id: "5", label: "平台部订单销售" },
       ],
       sitem: null, //传给组件
       activeNames: ["0", "1", "2", "3", "4", "5"],
@@ -289,6 +298,7 @@ export default {
       ],
       newTime: "",
       loading: false,
+      is_stock: "",
       queryId: "",
     };
   },
@@ -349,15 +359,19 @@ export default {
       }
     },
     async initData() {
-      const res = await asyncRequest.detail({ returnCode: this.queryId });
-      if (res && res.code === 0 && res.data) {
-        this.status = res.data.status;
-        this.sitem = res.data;
+      const { code, data, message } = await asyncRequest.detail({
+        returnCode: this.queryId,
+      });
+      if (code === 0) {
+        const { is_stock, status } = data;
+        this.is_stock = is_stock;
+        this.status = status;
+        this.sitem = data;
         this.getNewTime();
-      } else if (res && res.code >= 100 && res.code <= 104) {
+      } else if (code >= 100 && code <= 104) {
         await this.logout();
       } else {
-        this.$message.warning(res.message);
+        this.$message.warning(message);
       }
     },
   },

src/views/sellOut/zxDiffOrder/detail.vue

@@ -161,6 +161,7 @@ export default {
         { id: "2", label: "项目线上商品销售" },
         { id: "3", label: "咨询单销售" },
         { id: "4", label: "项目咨询单销售" },
+        { id: "5", label: "平台部订单销售" },
       ],
       customer_remark_options: [
         {