build

src/apis/service/goodStore/goodsOnline/index.js

@@ -37,10 +37,7 @@ export default {
 
   //导出线上商品
   exportgood: (data, params) => http(api + "exportgood", data, "post", params),
-
-
   //商品上线审核时、驳回重新审核
-
   goodupreject: (data, params) => http(api + "goodupreject", data, "post", params),
   // 异常原因列表
   resultlist: (data, params) => http(api + "resultlist", data, "post", params),

src/views/goodStore/goodsOnline/components/exam-form/main.vue

@@ -19,12 +19,9 @@
             :size="size || 'medium'"
             @change="stateChange"
           >
-            <el-radio
-              v-for="item in stateList"
-              :key="item.value"
-              :label="item.value"
-              >{{ item.label }}</el-radio
-            >
+            <el-radio v-for="item in stateList" :key="item.value" :label="item.value">{{
+              item.label
+            }}</el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item
@@ -50,11 +47,7 @@
         </el-form-item>
       </el-col>
       <el-col :span="12">
-        <el-form-item
-          label="审核备注"
-          v-if="ruleForm.state === '0'"
-          prop="remark"
-        >
+        <el-form-item label="审核备注" v-if="ruleForm.state === '0'" prop="remark">
           <el-input
             type="textarea"
             placeholder="请输入审核备注"
@@ -74,7 +67,7 @@
             >保 存
           </el-button>
         </el-form-item>
-        <el-form-item class="fr" v-if="ruleForm.state === '0'" >
+        <el-form-item class="fr" v-if="ruleForm.state === '0'">
           <el-button
             v-if="!isDetail"
             :size="'mini'"
@@ -130,7 +123,7 @@ export default {
       showModelThis: this.showModel,
       ruleForm: {
         state: "1", // 通过or驳回
-        numStatus:"",
+        numStatus: "",
 
         rebut: "", //驳回至
         remark: "",
@@ -175,7 +168,6 @@ export default {
     this.initForm();
   },
   methods: {
-
     async initForm() {
       this.loading = true;
       this.rulesThis = this.rules;
@@ -201,14 +193,14 @@ export default {
           this.ruleForm = {
             state: "1", // 通过or驳回
             rebut: "", //驳回至
-            numStatus:"",
+            numStatus: "",
             remark: "",
           };
         }
       });
     },
     async submitForm(numStatus) {
-      this.ruleForm.numStatus = numStatus
+      this.ruleForm.numStatus = numStatus;
       await this.$refs.ruleForm.validate(async (valid) => {
         if (valid) {
           this.$emit("searchChange", this.ruleForm);
@@ -222,5 +214,4 @@ export default {
 };
 </script>
 
-<style>
-</style>
+<style></style>

src/views/goodStore/goodsOnline/components/fixed-price-form.vue

@@ -18,11 +18,7 @@
         style="width: 100%; margin: 0 0 20px 0"
       >
         <el-table-column type="index" width="50" show-overflow-tooltip />
-        <el-table-column
-          prop="min_num"
-          label="起订量(>=)"
-          show-overflow-tooltip
-        >
+        <el-table-column prop="min_num" label="起订量(>=)" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-form-item
               v-show="scope.row.edit"
@@ -198,11 +194,7 @@
           </template>
         </el-table-column>
 
-        <el-table-column
-          prop="market_price"
-          label="市场价"
-          show-overflow-tooltip
-        >
+        <el-table-column prop="market_price" label="市场价" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-form-item
               v-show="scope.row.edit"
@@ -229,11 +221,7 @@
             <span v-show="!scope.row.edit">{{ scope.row.market_price }}</span>
           </template>
         </el-table-column>
-        <el-table-column
-          prop="market_platform"
-          label="对比平台"
-          show-overflow-tooltip
-        >
+        <el-table-column prop="market_platform" label="对比平台" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-form-item
               v-show="scope.row.edit"
@@ -249,9 +237,7 @@
                 :disabled="!scope.row.edit"
               />
             </el-form-item>
-            <span v-show="!scope.row.edit">{{
-              scope.row.market_platform
-            }}</span>
+            <span v-show="!scope.row.edit">{{ scope.row.market_platform }}</span>
           </template>
         </el-table-column>
         <el-table-column prop="status" label="状态" show-overflow-tooltip>
@@ -295,16 +281,10 @@
               v-if="scope.row.edit"
               placement="top"
             >
-              <i
-                class="el-icon-circle-check tb-icon"
-                @click="checkRow(scope.$index)"
-              ></i>
+              <i class="el-icon-circle-check tb-icon" @click="checkRow(scope.$index)"></i>
             </el-tooltip>
             <el-tooltip effect="dark" v-else content="修改" placement="top">
-              <i
-                class="el-icon-edit tb-icon"
-                @click="openCostEdit(scope.$index)"
-              ></i>
+              <i class="el-icon-edit tb-icon" @click="openCostEdit(scope.$index)"></i>
             </el-tooltip>
             <el-tooltip effect="dark" content="删除" placement="top">
               <i
@@ -321,6 +301,7 @@
       :model="ruleForm"
       status-icon
       :rules="rulesThis"
+      :label-position="'left'"
       class="demo-ruleForm-goodsOnline"
       :size="'mini'"
     >
@@ -330,25 +311,16 @@
             <el-radio-group
               v-model="ruleForm.state"
               placeholder="请选择审核状态"
-              style="width: 100%"
               :size="size || 'medium'"
               @change="stateChange"
             >
-              <el-radio
-                v-for="item in stateList"
-                :key="item.value"
-                :label="item.value"
-                >{{ item.label }}</el-radio
-              >
+              <el-radio v-for="item in stateList" :key="item.value" :label="item.value">{{
+                item.label
+              }}</el-radio>
             </el-radio-group>
           </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item
-            label="审核备注"
-            v-if="ruleForm.state === '0'"
-            prop="remark"
-          >
+          <el-form-item label="审核备注" prop="remark">
+            <!-- v-if="ruleForm.state === '0'" -->
             <el-input
               type="textarea"
               placeholder="审核备注"
@@ -359,52 +331,19 @@
               :autosize="{ minRows: 3, maxRows: 3 }"
             />
           </el-form-item>
-
-          <el-form-item class="fr" v-if="ruleForm.state === '0'">
-            <el-button
-              v-if="!isDetail"
-              :size="'mini'"
-              type="primary"
-              @click="rejectRe('')"
-              >驳回重新审核
-            </el-button>
-          </el-form-item>
-          <!-- <el-form-item class="fr" v-if="ruleForm.state === '0'" style="margin-right:30px;" >
-          <el-button
-            v-if="!isDetail"
-            :size="'mini'"
-            type="danger"
-            @click="rejectRe('8')"
-            >驳回并下线
-          </el-button>
-        </el-form-item> -->
         </el-col>
-        <el-col :span="24" v-if="ruleForm.state === '1'"
+
+        <el-col :span="12" v-if="ruleForm.state === '1'"
           ><el-form-item label="售价凭证类型" prop="proof_type">
-            <el-radio-group
-              v-model="ruleForm.proof_type"
-              @change="set_proof_url()"
-            >
-              <el-radio
-                v-for="item in options"
-                :key="item.value"
-                :label="item.value"
-                >{{ item.label }}</el-radio
-              >
+            <el-radio-group v-model="ruleForm.proof_type" @change="set_proof_url()">
+              <el-radio v-for="item in options" :key="item.value" :label="item.value">{{
+                item.label
+              }}</el-radio>
             </el-radio-group>
             <el-button class="fr" type="primary" @click="showVoucher = true"
               >查看历史凭证</el-button
             >
           </el-form-item>
-
-          <show-voucher-model
-            :showModel="showVoucher"
-            :id="spuCode"
-            @cancel="showVoucher = false"
-            @searchChange="resvoucher"
-          />
-        </el-col>
-        <el-col :span="18" v-if="ruleForm.state === '1'">
           <el-form-item label="凭证文件" prop="proof_url">
             <ul class="shangchuan-ul">
               <li v-if="ruleForm.proof_type === '1'" class="shiping">
@@ -518,14 +457,24 @@
               </li>
             </ul>
           </el-form-item>
+          <show-voucher-model
+            :showModel="showVoucher"
+            :id="spuCode"
+            @cancel="showVoucher = false"
+            @searchChange="resvoucher"
+          />
         </el-col>
-        <el-col :span="6" v-if="ruleForm.state === '1'">
+
+        <el-col :span="24">
           <el-form-item class="fr">
             <el-button
-              v-if="!isDetail"
+              v-if="!isDetail && ruleForm.state !== '1'"
               :size="'mini'"
               type="primary"
-              @click="submitForm"
+              @click="rejectRe('')"
+              >驳回重新审核
+            </el-button>
+            <el-button v-if="!isDetail" :size="'mini'" type="primary" @click="submitForm"
               >保 存
             </el-button>
           </el-form-item>
@@ -789,10 +738,10 @@ export default {
     stateChange() {
       if (this.ruleForm.state === "1") {
         this.rulesThis.rebut[0].required = false;
-        this.rulesThis.remark[0].required = false;
+        // this.rulesThis.remark[0].required = false;
       } else {
         this.rulesThis.rebut[0].required = true;
-        this.rulesThis.remark[0].required = true;
+        // this.rulesThis.remark[0].required = true;
       }
     },
 
@@ -849,9 +798,7 @@ export default {
               this.$message.warning("当前已有相同起订量的销售价！");
               return;
             }
-            let { isok, price, message, new_cost_fee } = await this.get_new(
-              rowIndex
-            );
+            let { isok, price, message, new_cost_fee } = await this.get_new(rowIndex);
             if (isok === 0) {
               this.addrForm.good_ladder[rowIndex].new_sale_price = price;
               this.addrForm.good_ladder[rowIndex].new_cost_fee = new_cost_fee;
@@ -881,9 +828,7 @@ export default {
           this.addrForm.good_ladder[index].new_sale_price = "0";
         } else {
           if (!this.addrForm.good_ladder[index].search_loading) {
-            let { isok, price, message, new_cost_fee } = await this.get_new(
-              index
-            );
+            let { isok, price, message, new_cost_fee } = await this.get_new(index);
             if (isok === 0) {
               this.addrForm.good_ladder[index].new_sale_price = price;
               this.addrForm.good_ladder[index].new_cost_fee = new_cost_fee;
@@ -1004,9 +949,7 @@ export default {
               if (isok === 0) {
                 this.addrForm.good_ladder[i].new_sale_price = price;
                 this.addrForm.good_ladder[i].new_cost_fee = new_cost_fee;
-                this.addrForm.good_ladder[i].this.addrForm.good_ladder[
-                  i
-                ].edit = false;
+                this.addrForm.good_ladder[i].this.addrForm.good_ladder[i].edit = false;
               } else if (isok >= 100 && isok <= 104) {
                 await this.logout();
               } else {
@@ -1014,8 +957,7 @@ export default {
                 this.addrForm.good_ladder[i].new_sale_price = price;
                 this.addrForm.good_ladder[i].new_cost_fee = new_cost_fee;
                 this.addrForm.good_ladder[i].edit = true;
-                this.addrForm.good_ladder[i].newTime =
-                  new Date().valueOf() + "";
+                this.addrForm.good_ladder[i].newTime = new Date().valueOf() + "";
               }
             }
             if (!all_is_ok) {
@@ -1244,4 +1186,4 @@ export default {
     }
   }
 }
-</style>
+</style>

src/views/goodStore/goodsOnline/detail.vue

@@ -32,8 +32,7 @@
                   <el-popover placement="top" width="300" trigger="hover">
                     <ul>
                       <li>
-                        <span>上线商品编号：</span
-                        ><span>{{ sitem.skuCode }}</span>
+                        <span>上线商品编号：</span><span>{{ sitem.skuCode }}</span>
                       </li>
                       <li
                         v-if="
@@ -43,12 +42,10 @@
                           private_field.some((item) => item == '1')
                         "
                       >
-                        <span>成本商品编号：</span
-                        ><span>{{ sitem.spuCode }}</span>
+                        <span>成本商品编号：</span><span>{{ sitem.spuCode }}</span>
                       </li>
                       <li>
-                        <span>平台商品编码：</span
-                        ><span>{{ sitem.plat_code }}</span>
+                        <span>平台商品编码：</span><span>{{ sitem.plat_code }}</span>
                       </li>
                     </ul>
                     <i class="el-icon-warning-outline fr" slot="reference"></i>
@@ -59,8 +56,7 @@
                   <el-popover placement="top" width="300" trigger="hover">
                     <ul>
                       <li>
-                        <span>业务企业编号：</span
-                        ><span>{{ sitem.companyNo }}</span>
+                        <span>业务企业编号：</span><span>{{ sitem.companyNo }}</span>
                       </li>
                     </ul>
                     <i class="el-icon-warning-outline fr" slot="reference"></i>
@@ -85,10 +81,8 @@
                   <el-tag
                     :size="'mini'"
                     v-text="
-                      (
-                        options6.find((item) => item.id == sitem.supply_area) ||
-                        {}
-                      ).name || '--'
+                      (options6.find((item) => item.id == sitem.supply_area) || {})
+                        .name || '--'
                     "
                   />
                 </template>
@@ -96,8 +90,8 @@
                   <el-tag
                     :size="'mini'"
                     v-text="
-                      (options4.find((item) => item.id == sitem.is_stock) || {})
-                        .name || '--'
+                      (options4.find((item) => item.id == sitem.is_stock) || {}).name ||
+                      '--'
                     "
                   />
                 </template>
@@ -105,10 +99,8 @@
                   <el-tag
                     :size="'mini'"
                     v-text="
-                      (
-                        options8.find((item) => item.id == sitem.exam_status) ||
-                        {}
-                      ).name || '--'
+                      (options8.find((item) => item.id == sitem.exam_status) || {})
+                        .name || '--'
                     "
                   />
                 </template>
@@ -116,15 +108,11 @@
                   <el-tag
                     :size="'mini'"
                     v-text="
-                      (
-                        options1.find((item) => item.id == sitem.good_type) ||
-                        {}
-                      ).name || '--'
+                      (options1.find((item) => item.id == sitem.good_type) || {}).name ||
+                      '--'
                     "
                   />
-                  <span
-                    v-if="sitem.good_type === '1'"
-                    style="padding: 0 0 0 5px"
+                  <span v-if="sitem.good_type === '1'" style="padding: 0 0 0 5px"
                     >{{ sitem.moq }}起订/工期{{ sitem.customized }}天</span
                   >
                 </template>
@@ -134,9 +122,9 @@
                       sitem.noble_name
                     }}-{{ sitem.gold_price ? sitem.gold_price : "0" }}元/g-{{
                       sitem.is_gold_price === "0" ? "不" : ""
-                    }}启用实时金价-{{
-                      sitem.is_diff === "1" ? "有" : "无"
-                    }}工差-{{ sitem.config }}-{{ sitem.other_config }}</span
+                    }}启用实时金价-{{ sitem.is_diff === "1" ? "有" : "无" }}工差-{{
+                      sitem.config
+                    }}-{{ sitem.other_config }}</span
                   >
                 </template>
               </show-data-table>
@@ -156,8 +144,7 @@
                   <el-popover placement="top" width="300" trigger="hover">
                     <ul>
                       <li>
-                        <span>供应商编号：</span
-                        ><span>{{ sitem.supplierNo }}</span>
+                        <span>供应商编号：</span><span>{{ sitem.supplierNo }}</span>
                       </li>
                     </ul>
                     <i class="el-icon-warning-outline fr" slot="reference"></i>
@@ -167,8 +154,8 @@
                   <el-tag
                     :size="'mini'"
                     v-text="
-                      (options3.find((item) => item.id == sitem.is_auth) || {})
-                        .name || '--'
+                      (options3.find((item) => item.id == sitem.is_auth) || {}).name ||
+                      '--'
                     "
                   />
                 </template>
@@ -177,8 +164,8 @@
                   <el-tag
                     :size="'mini'"
                     v-text="
-                      (options7.find((item) => item.id == sitem.is_step) || {})
-                        .name || '--'
+                      (options7.find((item) => item.id == sitem.is_step) || {}).name ||
+                      '--'
                     "
                   />
                 </template>
@@ -334,15 +321,11 @@
     </div>
   </div>
 </template>
-   <script>
+<script>
 import asyncRequest from "@/apis/service/goodStore/goodsOnline";
 import resToken from "@/mixins/resToken";
 import { mapGetters } from "vuex";
-import {
-  public_listCol,
-  purchase_listCol,
-  sale_listCol,
-} from "./ShowDataTableColumns";
+import { public_listCol, purchase_listCol, sale_listCol } from "./ShowDataTableColumns";
 import onlineExamForm from "./components/online-exam-form";
 import fixedPriceForm from "./components/fixed-price-form";
 import handleOnlineForm from "./components/handle-online-form";
@@ -443,7 +426,6 @@ export default {
         if ((e.numStatus ?? "") == "") {
           //驳回重新审核
           await this.setstatus("提交产品部门审核结果", model);
-          
         } else if (e.numStatus == "3") {
           //点击保存
           // return;
@@ -506,7 +488,7 @@ export default {
       if (!this.loading) {
         let model = {
           skuCode: this.queryId,
-          exam_status:e.numStatus,
+          exam_status: e.numStatus,
           plat_code: e.plat_code,
           remark: e.remark || "",
         };
@@ -514,7 +496,6 @@ export default {
         if ((e.numStatus ?? "") == "") {
           //驳回重新审核
           await this.setstatus("驳回重新审核吗", model);
-
         } else if (e.numStatus == "6") {
           //点击保存
           // return;
@@ -527,8 +508,6 @@ export default {
     },
 
     async setstatus(detail, model) {
-      
-
       await this.$confirm(`确定要${detail}？`, {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -536,9 +515,11 @@ export default {
       })
         .then(async () => {
           let res = null;
-          if(model.exam_status == ""){
+          if (model.exam_status == "") {
+            model.exam_remark = model.remark;
+            delete model["remark"];
             res = await asyncRequest.goodupreject(model);
-          }else{
+          } else {
             res = await asyncRequest.status(model);
           }
           if (res && res.code === 0) {
@@ -575,8 +556,7 @@ export default {
       this.loading = false;
       if (code === 0) {
         this.sitem = JSON.parse(JSON.stringify(data));
-        const { exam_status, cat_info, ladderlist, nakelist, spuCode } =
-          this.sitem;
+        const { exam_status, cat_info, ladderlist, nakelist, spuCode } = this.sitem;
         this.spuCode = spuCode;
         this.ladderlist = JSON.parse(JSON.stringify(ladderlist));
         this.nakelist = JSON.parse(JSON.stringify(nakelist));
@@ -607,7 +587,7 @@ export default {
   },
 };
 </script>
-   <style lang="scss" scoped>
+<style lang="scss" scoped>
 .goodsOnlineDetail {
   width: 100%;
   box-sizing: border-box;
@@ -646,4 +626,3 @@ export default {
   }
 }
 </style>
-