build

src/views/goodStore/goodsCost/detail.vue

@@ -57,9 +57,7 @@
                   </template>
 
                   <template slot="is_combind">
-                    {{
-                    String(sitem.is_combind) === '1' ? '组合商品' : '非组合商品'
-                    }}
+                    {{ String(sitem.is_combind) === '1' ? '组合商品' : '非组合商品' }}
                   </template>
 
                   <template slot="packing_spec">
@@ -77,9 +75,10 @@
                   <template slot="good_info_img">
                     <div style="max-height: 24px; overflow: hidden">
                       <el-image
-                        style="height: 24px; width: 24px"
-                        :src="sitem.good_info_img"
-                        :preview-src-list="[sitem.good_info_img]"
+                        v-for="imgSrc in sitem.good_info_img ? sitem.good_info_img.split(',') : []"
+                        style="height: 24px; width: 24px;margin-right: 5px"
+                        :src="imgSrc"
+                        :preview-src-list="[imgSrc]"
                       />
                     </div>
                   </template>

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

@@ -204,7 +204,7 @@
                 v-model="scope.row.market_platform"
                 placeholder="对比平台"
                 maxlength="50"
-                :disabled="!scope.row.edit"
+                :disabled="!scope.row.edit || sitem.create_source === '1'"
               />
             </el-form-item>
             <span v-show="!scope.row.edit">{{ scope.row.market_platform }}</span>
@@ -248,7 +248,7 @@
             <el-tooltip effect="dark" v-else content="修改" placement="top">
               <i class="el-icon-edit tb-icon" @click="openCostEdit(scope.$index)"></i>
             </el-tooltip>
-            <el-tooltip effect="dark" content="删除" placement="top">
+            <el-tooltip effect="dark" content="删除" placement="top" v-if="sitem.create_source !== '1'">
               <i class="el-icon-delete tb-icon" @click="openCostEditDelete(scope.$index)"></i>
             </el-tooltip>
           </template>
@@ -450,9 +450,9 @@
 </template>
 
 <script>
+import companyHelper from "@/mixins/companyHelper";
 import asyncRequest from "@/apis/service/goodStore/goodsOnline";
 import showVoucherModel from "@/components/show-voucher-model";
-import companyHelper from "@/mixins/companyHelper";
 import { isAlphanumeric, isnumber, validAlphabets } from "@/utils/validate";
 
 export default {
@@ -490,9 +490,9 @@ export default {
     const validate_num = (rule, value, callback) => {
       const { required } = rule;
       if (required && value === "") {
-        callback(new Error("不能为空！"));
+        callback(new Error("不能为空"));
       } else {
-        callback();
+        callback(); 
       }
     };
     const validate_num_0 = (rule, value, callback) => {
@@ -597,18 +597,18 @@ export default {
             trigger: "change"
           }
         ],
-        plat_code: [
+        proof_url: [
           {
             required: true,
-            validator: validate_plat_code,
-            trigger: "change"
+            message: "请上传凭证文件",
+            trigger: "blur,change"
           }
         ],
-        proof_url: [
+        plat_code: [
           {
             required: true,
-            message: "请上传凭证文件",
-            trigger: "blur,change"
+            validator: validate_plat_code,
+            trigger: "change"
           }
         ],
         rebut: [
@@ -848,7 +848,7 @@ export default {
         if (min_num === "" || min_num === "0") {
           this.addrForm.good_ladder[index].new_sale_price = "0";
         } else {
-          if (!this.addrForm.good_ladder[index].search_loading) {
+          if (!this.addrForm.good_ladder[index].search_loading && this.sitem.create_source !== "1") {
             let { isok, price, message, new_cost_fee } = await this.get_new(
               index
             );
@@ -902,31 +902,13 @@ export default {
             proof_type: proof && proof.proof_type ? proof.proof_type : "1", // 通过or驳回
             proof_url: proof && proof.proof_url ? proof.proof_url : "" //驳回至
           };
+          
           this.addrForm = {
-            good_ladder:
-              ladderlist && ladderlist.length > 0
-                ? JSON.parse(JSON.stringify(ladderlist))
-                : []
+            good_ladder: ladderlist && ladderlist.length > 0 ? JSON.parse(JSON.stringify(ladderlist)) : []
           };
 
-          if(this.sitem.create_source === '1'){
-            this.good_ladder = [
-              {
-                cost_fee:"0",
-                edit:false,
-                market_platform: "京东",
-                market_price: "",
-                new_sale_price:Number(this.sitem.sale_price),
-                sale_price:"0",
-                search_loading:false
-              }
-            ]
-
-            console.log(this.good_ladder);
-          }else{
-            this.good_ladder = ladderlist && ladderlist.length > 0 ? JSON.parse(JSON.stringify(ladderlist)) : [];
-          }
-
+          this.good_ladder = ladderlist && ladderlist.length > 0 ? JSON.parse(JSON.stringify(ladderlist)) : [];
+          
           switch (this.ruleForm.proof_type) {
             case "1":
               this.video_url = this.ruleForm.proof_url;
@@ -940,8 +922,28 @@ export default {
             default:
               this.video_url = this.ruleForm.proof_url;
           }
+
           this.$refs.ruleForm.validateField("proof_url");
-          for (let i = 0; i < this.addrForm.good_ladder.length; i++) {
+
+          if(this.sitem.create_source === "1"){
+            this.addrForm.good_ladder = [
+              {
+                edit: true,
+                min_num: this.sitem.nakelist[0].min_num,
+                sale_price: "0",
+                cost_fee: "0",
+                market_price: "0",
+                market_platform: "京东",
+                status: "1",
+                ...(this.sitem.is_gold_price === "0" 
+                ? ({ new_sale_price: Number(this.sitem.nakelist[0].nake_fee), new_cost_fee: "0"}) 
+                : ({ new_cost_fee: Number(this.sitem.nakelist[0].cost_fee) , new_sale_price: "0" }))
+              }
+            ]
+
+            console.log("cost_fee=" + this.addrForm.good_ladder[0].new_cost_fee)
+          } else {
+            for (let i = 0; i < this.addrForm.good_ladder.length; i++) {
             let { isok, price, new_cost_fee, message } = await this.get_new(i);
             if (isok === 0) {
               this.addrForm.good_ladder[i].new_sale_price = price;
@@ -957,6 +959,7 @@ export default {
               this.$message.warning(message);
             }
           }
+          }
         }
       });
     },
@@ -1008,6 +1011,7 @@ export default {
                   isok = false;
                 }
 
+               if(this.sitem.create_source !== "1"){
                 let { isok, price, new_cost_fee } = await this.get_new(i);
                 if (isok === 0) {
                   this.set_ladder_item(i, price, new_cost_fee);
@@ -1017,6 +1021,7 @@ export default {
                   all_is_ok = false;
                   this.set_ladder_item(i, price, new_cost_fee);
                 }
+               }
               }
 
               for (

src/views/sellOut/zixunOrder/components/buyGoodModal.vue

@@ -146,7 +146,7 @@
                   </el-form-item>
 
                   <el-col :span="12">
-                    <el-form-item label="凭证类型" prop="proof_type" label-width="85px">
+                    <el-form-item label="凭证类型" prop="proof_type" label-width="85px" v-model="proof_type">
                       <el-select
                         v-model="ruleForm.proof_type"
                         placeholder="凭证类型"
@@ -728,14 +728,14 @@ export default {
         ],
         proof_type: [
           {
-            required: false,
+            required: true,
             message: "请选择凭证类型",
             trigger: "change"
           }
         ],
         proof_url: [
           {
-            required: false,
+            required: true,
             message: "请上传凭证文件",
             trigger: "blur,change"
           }
@@ -851,6 +851,8 @@ export default {
     async initForm() {
       this.loading = true;
       this.rulesThis = this.rules;
+
+      console.log(this.rulesThis)
       const { can } = this.sitem;
       this.sitem.can_name = "";
       this.sitem.is_noble = false;