Merge branch 'sit'

src/App.vue

@@ -15,6 +15,16 @@ export default {
     };
   },
   async created() {
+    // let list1=''
+    // let list2=""
+    // const key=".",zhkey='xiaod',mmkey='223322'
+    // for(let i=0;i<500;i++){
+    //   list1+=`${i===0?'':key}${zhkey}${i+1}`
+    //   list2+=`${i===0?'':key}${mmkey}`
+
+    // }
+    // console.log(list1);
+    // console.log(list2);
     if (JudgeEnvironment() === "isDingDing") {
       await this.testing();
     } else {

src/apis/service/sellOut/salesOrder/index.js

@@ -19,5 +19,5 @@ export default {
   // 线上商品详情
   goods_detail: (data, params) => http(api + "goodinfo", data, "post", params),
   // 线上商品获取活动
-  goods_active: (data, params) => http(api + "goodinfo", data, "post", params),
+  goods_active: (data, params) => http(api + "actquery", data, "post", params),
 };

src/styles/index.scss

@@ -608,36 +608,36 @@ aside {
     float: left;
     border: 1px solid rgb(220, 223, 230);
     box-sizing: border-box;
-    width: 84px;
-    height: 84px;
-    line-height: 84px;
+    width:50px;
+    height:50px;
+    line-height:50px;
     text-align: center;
   }
   .Upload {
-    width: 84px;
-    height: 84px;
-    line-height: 84px;
+    width:50px;
+    height:50px;
+    line-height:50px;
     text-align: center;
     position: absolute;
     line-height: 0px;
     top: 0;
     left: 0;
-    line-height: 84px;
+    line-height:50px;
   }
   .fileUp {
     vertical-align: top;
   }
   .avatar {
-    width: 84px;
-    height: 84px;
-    line-height: 84px;
+    width:50px;
+    height:50px;
+    line-height:50px;
     text-align: center;
   }
   .avatar-uploader .el-upload:hover {
     border-color: #409eff;
   }
   .avatar-uploader-icon {
-    font-size: 28px;
+    font-size: 20px;
     color: #8c939d;
     width: 50px;
     height: 50px;
@@ -653,10 +653,10 @@ aside {
     display: inline-block;
     font-size: 12px;
     color: #606266;
-    padding: 9px 0 0 15px;
+    padding: 0 0 0 15px;
     p {
       margin: 0;
-      line-height: 28px;
+      line-height: 22px;
     }
   }
   .avatar-uploader .el-upload {
@@ -671,4 +671,5 @@ aside {
   &:hover{
     cursor: pointer!important;
   }
-}
+}
+

src/views/goodStore/goodsCost/columns.js

@@ -145,6 +145,16 @@ const validate_num_0 = (rule, value, callback) => {
     callback();
   }
 };
+const validate_good_img = (rule, value, callback) => {
+  const { required } = rule
+  if (required && value.length == 0) {
+    callback(new Error("请上传商品主图！"));
+  } else if (required && (value.length < 3 || value.length > 10)) {
+    callback(new Error("商品主图应为3~10张！"));
+  } else {
+    callback();
+  }
+};
 const rules = {
   cat_id: [
     {
@@ -208,7 +218,7 @@ const rules = {
   is_auth: [
     {
       required: true,
-      message: "商品主图",
+      message: "请选择是否有权限销售",
       trigger: "change",
     },
   ],
@@ -382,7 +392,15 @@ const rules = {
   good_thumb_img: [
     {
       required: true,
-      message: "商品主图",
+      message: "请上传商品缩略图",
+      trigger: "change",
+    },
+  ],
+  good_img: [
+    {
+      type: "array",
+      required: true,
+      validator: validate_good_img,
       trigger: "change",
     },
   ],
@@ -390,7 +408,7 @@ const rules = {
     {
       type: "array",
       required: true,
-      message: "商品详情介绍图",
+      message: "至少上传一张商品详情介绍图",
       trigger: "change",
     },
   ],

src/views/goodStore/goodsCost/components/baseForm.vue

@@ -6,7 +6,7 @@
     ref="ruleForm"
     :size="'mini'"
     v-loading="loading"
-    label-width="110px"
+    label-width="90px"
   >
     <el-row class="ddiv">
       <el-col :span="1" class="dtitle">
@@ -146,7 +146,7 @@
           </el-col>
 
           <el-col :span="8">
-            <el-form-item label="商品总重量" prop="weight">
+            <el-form-item label="商品总重量" prop="weight" label-width="95px">
               <digital-input
                 :values="ruleForm.weight"
                 :name="'ruleForm.weight'"
@@ -164,7 +164,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="是否库存品" prop="is_stock">
+            <el-form-item label="是否库存品" prop="is_stock" label-width="95px">
               <el-select
                 v-model="ruleForm.is_stock"
                 filterable
@@ -187,7 +187,11 @@
           <el-col :span="24" v-show="is_noble">
             <el-row>
               <el-col :span="8">
-                <el-form-item label="贵金属重量" prop="noble_weight">
+                <el-form-item
+                  label="贵金属重量"
+                  prop="noble_weight"
+                  label-width="95px"
+                >
                   <digital-input
                     :values="ruleForm.noble_weight"
                     :placeholder="'贵金属重量'"
@@ -209,7 +213,11 @@
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="贵金属种类" prop="noble_metal">
+                <el-form-item
+                  label="贵金属种类"
+                  prop="noble_metal"
+                  label-width="95px"
+                >
                   <search-metal-kind
                     :value="ruleForm.noble_metal"
                     :disabled="
@@ -225,7 +233,11 @@
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="启用实时金价" prop="is_gold_price">
+                <el-form-item
+                  label="启用实时金价"
+                  prop="is_gold_price"
+                  label-width="110px"
+                >
                   <el-select
                     v-model="ruleForm.is_gold_price"
                     filterable
@@ -290,7 +302,11 @@
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="其他配置要求" prop="other_config">
+                <el-form-item
+                  label="其他配置要求"
+                  prop="other_config"
+                  label-width="110px"
+                >
                   <el-input
                     placeholder="其他配置要求"
                     maxlength="100"
@@ -362,7 +378,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8" v-show="ruleForm.good_type === '1'">
-            <el-form-item label="定制起订量" prop="moq">
+            <el-form-item label="定制起订量" prop="moq" label-width="95px">
               <digital-input
                 :values="ruleForm.moq"
                 :placeholder="'定制起订量'"
@@ -658,7 +674,7 @@
                 :is-detail="id !== 'add'"
                 :disabled="type === 'view' || type === 'editCoin'"
                 :size="'mini'"
-                @selectChange="selectAreadelivery_place"
+                @selectChange="selectAreaChange($event, 'delivery_place')"
               />
             </el-form-item>
           </el-col>
@@ -670,7 +686,7 @@
                 :size="'mini'"
                 :is-detail="id !== 'add'"
                 :disabled="type === 'view' || type === 'editCoin'"
-                @selectChange="selectAreaorigin_place"
+                @selectChange="selectAreaChange($event, 'origin_place')"
               />
             </el-form-item>
           </el-col>
@@ -688,11 +704,11 @@
       >
       <el-col :span="23" class="dmain">
         <el-row style="padding: 0 0 20px 0">
-          <el-col :span="8">
+          <el-col :span="6">
             <el-form-item
-              label="商品主图"
+              label="商品缩略"
               prop="good_thumb_img"
-              class="activity-upload"
+              class="activity-upload my-label-top"
             >
               <div class="btnupload" style="position: relative">
                 <img
@@ -707,8 +723,10 @@
                   :accept="'.jpg,.png,.jpeg'"
                   :multiple="true"
                   :uploadcondition="beforeAvatarUpload"
-                  @UploadErrorEvent="UploadErrorEventgood_thumb_img"
-                  @UploadSuccessEvent="UploadSuccessEventgood_thumb_img"
+                  @UploadErrorEvent="UploadErrorEvent($event, 'good_thumb_img')"
+                  @UploadSuccessEvent="
+                    UploadSuccessEvent($event, 'good_thumb_img')
+                  "
                 ></file-upload>
               </div>
               <div class="txt-tips fl">
@@ -721,8 +739,57 @@
               <span style="padding: 0 0 0 20px">图片类型.jpg/png/jpeg</span>
             </div>
           </el-col>
-          <el-col :span="16">
-            <el-form-item label="详情介绍图" prop="good_info_img">
+          <el-col :span="9">
+            <el-form-item label="商品主图" prop="good_img">
+              <div class="good_info_img_div">
+                <ul v-if="ruleForm.good_img" class="clear">
+                  <li
+                    class="img-show-li"
+                    v-viewer
+                    v-for="(img, iindex) in ruleForm.good_img"
+                    :key="img + iindex"
+                  >
+                    <div class="img-show-li-div">
+                      <img :src="img" class="img-show" alt="" />
+                      <i
+                        v-if="type == 'add' || type === 'editBase'"
+                        class="el-icon-close"
+                        @click="closeImg(iindex, 'good_img')"
+                      ></i>
+                    </div>
+                  </li>
+                  <li
+                    class="img-show-li"
+                    v-if="
+                      ruleForm.good_img.length < 10 &&
+                      (type == 'add' || type === 'editBase')
+                    "
+                  >
+                    <div class="activity-upload">
+                      <div class="btnupload" style="position: relative">
+                        <i class="el-icon-plus avatar-uploader-icon"></i>
+                        <file-upload
+                          class="Upload"
+                          :disabled="type === 'view' || type === 'editCoin'"
+                          :accept="'.jpg,.png,.jpeg'"
+                          :multiple="true"
+                          :uploadcondition="beforeAvatarUpload"
+                          @UploadErrorEvent="
+                            UploadErrorEvent($event, 'good_img')
+                          "
+                          @UploadSuccessEvent="
+                            UploadSuccessEvent($event, 'good_img')
+                          "
+                        ></file-upload>
+                      </div>
+                    </div>
+                  </li>
+                </ul>
+              </div>
+            </el-form-item>
+          </el-col>
+          <el-col :span="9">
+            <el-form-item label="详情介绍" prop="good_info_img">
               <div class="good_info_img_div">
                 <ul v-if="ruleForm.good_info_img" class="clear">
                   <li
@@ -736,7 +803,7 @@
                       <i
                         v-if="type == 'add' || type === 'editBase'"
                         class="el-icon-close"
-                        @click="closeImg(iindex)"
+                        @click="closeImg(iindex, 'good_info_img')"
                       ></i>
                     </div>
                   </li>
@@ -756,8 +823,12 @@
                           :accept="'.jpg,.png,.jpeg'"
                           :multiple="true"
                           :uploadcondition="beforeAvatarUpload"
-                          @UploadErrorEvent="UploadErrorEventgood_info_img"
-                          @UploadSuccessEvent="UploadSuccessEventgood_info_img"
+                          @UploadErrorEvent="
+                            UploadErrorEvent($event, 'good_info_img')
+                          "
+                          @UploadSuccessEvent="
+                            UploadSuccessEvent($event, 'good_info_img')
+                          "
                         ></file-upload>
                       </div>
                     </div>
@@ -1269,6 +1340,7 @@ export default {
           model.delivery_place = model.delivery_place.toString();
           model.origin_place = model.origin_place.toString();
           model.good_info_img = model.good_info_img.toString();
+          model.good_img = model.good_img.toString();
           model.unit = model.unit.toString();
           model.speclist = JSON.parse(JSON.stringify(this.setResData(1)));
           model.good_ladder = JSON.parse(JSON.stringify(this.setResData(2)));
@@ -1525,6 +1597,7 @@ export default {
         lead_time: "0",
         sample_day: "0",
         good_thumb_img: "",
+        good_img: [],
         good_info_img: [],
         //固定阶梯成本
         cert_fee: "0",
@@ -1594,7 +1667,7 @@ export default {
             lead_time, //	string	供货周期
             sample_day, //string	调样周期
             sample_fee, //		string	调样费有
-            // good_img, //	string	商品图片
+            good_img, //	string	商品图片
             good_thumb_img, //	string	商品说略图
             good_info_img, //	string	商品详情图
             cert_fee, //	string	证书费
@@ -1707,13 +1780,15 @@ export default {
             good_size: good_size || "",
             good_bar: good_bar || "",
             supply_area: supply_area || "",
-            delivery_place: delivery_place?(delivery_place || "").split(","):[],
-            origin_place: origin_place?(origin_place || "").split(","):[],
+            delivery_place: delivery_place
+              ? (delivery_place || "").split(",")
+              : [],
+            origin_place: origin_place ? (origin_place || "").split(",") : [],
             delivery_day: delivery_day || "",
             lead_time: lead_time || "",
             sample_day: sample_day || "",
             good_thumb_img: good_thumb_img || "",
-            // good_img: "",
+            good_img: good_img ? (good_img || "").split(",") : [],
             good_info_img: good_info_img
               ? (good_info_img || "").split(",")
               : [],
@@ -1745,7 +1820,11 @@ export default {
         "is_diff",
         "config",
         "other_config",
+<<<<<<< HEAD
         'cgd_gold_price'
+=======
+        "cgd_gold_price",
+>>>>>>> sit
       ];
       for (let i = 0; i < list.length; i++) {
         this.rulesThis[list[i]][0].required = this.is_noble;
@@ -1950,48 +2029,28 @@ export default {
       }
       this.$refs.ruleForm.validateField("noble_metal");
     },
-    //仓库省市区
-    selectAreadelivery_place(e) {
-      this.ruleForm.delivery_place = e;
-      this.$refs.ruleForm.validateField("delivery_place");
-    },
-    //仓库省市区
-    selectAreaorigin_place(e) {
-      this.ruleForm.origin_place = e;
-      this.$refs.ruleForm.validateField("origin_place");
-    },
-    closeImg(index) {
-      this.ruleForm.good_info_img.splice(index, 1);
-      this.$refs.ruleForm.validateField("good_info_img");
-    },
-    //图片上传成功
-    async UploadSuccessEventgood_thumb_img(data) {
-      await this.UploadSuccessEvent(1, data);
+    //省市区
+    selectAreaChange(e, key) {
+      this.ruleForm[key] = e;
+      this.$refs.ruleForm.validateField(key);
     },
-    // //图片上传成功
-    // async UploadSuccessEventgood_img(data) {
-    //   await this.UploadSuccessEvent(2, data);
-    // },
-    //图片上传成功
-    async UploadSuccessEventgood_info_img(data) {
-      await this.UploadSuccessEvent(3, data);
+    closeImg(index, key) {
+      this.ruleForm[key].splice(index, 1);
+      this.$refs.ruleForm.validateField(key);
     },
+
     //图片上传成功
-    async UploadSuccessEvent(type, data) {
+    async UploadSuccessEvent(data, key) {
       const { url } = data;
       if (url === "noToken") {
         await this.logout();
       } else {
-        if (type === 1) {
-          this.ruleForm.good_thumb_img = url;
-          this.$refs.ruleForm.validateField("good_thumb_img");
-        } else if (type === 2) {
-          this.ruleForm.good_img = url;
-          this.$refs.ruleForm.validateField("good_img");
+        if (key === "good_thumb_img") {
+          this.ruleForm[key] = url;
         } else {
-          this.ruleForm.good_info_img.push(url);
-          this.$refs.ruleForm.validateField("good_info_img");
+          this.ruleForm[key].push(url);
         }
+        this.$refs.ruleForm.validateField(key);
         this.$message.success("图片上传成功!");
       }
     },
@@ -2003,28 +2062,10 @@ export default {
         this.$refs.ruleForm.validateField(list[i]);
       }
     },
-    //图片上传失败
-    UploadErrorEventgood_thumb_img(res) {
-      this.imgUploadError(1, res);
-    },
-    // //图片上传失败
-    // UploadErrorEventgood_img(res) {
-    //   this.imgUploadError(2, res);
-    // },
-    //图片上传失败
-    UploadErrorEventgood_info_img(res) {
-      this.imgUploadError(3, res);
-    },
-    imgUploadError(type, res) {
+    imgUploadError(res, key) {
       if (res !== "break") {
         this.$message.error("图片上传失败!");
-        this.$refs.ruleForm.validateField(
-          type === 1
-            ? "good_thumb_img"
-            : type === 2
-            ? "good_img"
-            : "good_info_img"
-        );
+        this.$refs.ruleForm.validateField(key);
       }
     },
     //判断图片规格
@@ -2057,12 +2098,12 @@ export default {
       width: 100%;
       li {
         float: left;
-        width: 89px;
-        height: 89px;
+        width: 55px;
+        height: 55px;
         padding: 0 5px 0 0;
         .img-show-li-div {
-          width: 84px;
-          height: 84px;
+          width: 50px;
+          height: 50px;
           border: 1px solid #dfe4ed;
           background: #dfe4ed;
           position: relative;

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

@@ -330,7 +330,7 @@
             <li v-if="ruleForm.proof_type === '2'" class="tupian">
               <div v-if="img_url" class="clearfix">
                 <img
-                  style="width: 84px; height: 84px"
+                  style="width:50px; height:50px"
                   :src="img_url"
                   class="avatar fl"
                 />

src/views/purchaseIn/workbench/components/packForm.vue

@@ -636,8 +636,8 @@ export default {
 
       li {
         float: left;
-        width: 84px;
-        height: 84px;
+        width:50px;
+        height:50px;
         overflow: hidden;
         margin: 0 10px 10px 0;
         border: 1px solid rgb(220, 223, 230);

src/views/sellOut/project/components/costFormAddEdit.vue

@@ -89,7 +89,7 @@
             <el-form-item label="商品图片" prop="good_img">
               <div v-if="ruleForm.good_img" class="clearfix">
                 <img
-                  style="width: 84px; height: 84px"
+                  style="width:50px; height:50px"
                   :src="ruleForm.good_img"
                   class="avatar fl"
                 />

src/views/sellOut/salesOrder/components/addForm.vue

@@ -84,7 +84,11 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="销售商品" prop="good_code">
+              <el-form-item
+                :label="ruleForm.good_code === '' ? '销售商品' : ''"
+                prop="good_code"
+                :label-width="ruleForm.good_code === '' ? '95px' : '0'"
+              >
                 <el-input
                   v-if="ruleForm.good_code === ''"
                   v-model="ruleForm.good_code"
@@ -848,10 +852,7 @@ export default {
     getNewTime() {
       this.newTime = new Date().valueOf();
     },
-    number_change(e, key) {
-      this.ruleForm[key] = e + "" || "0";
-      this.$refs.ruleForm.validateField(key);
-    },
+
     async resetForm() {
       // 重置
       await this.$nextTick(() => {
@@ -942,13 +943,13 @@ export default {
       this.ruleForm.proof_type = "";
       this.$refs.ruleForm.validateField("proof_id");
       if (e.length === 1) {
-        await this.get_goods_active()
+        await this.get_goods_active();
       }
     },
     async get_goods_active() {
-      const { skuCode, supplierNo, platform_id } = this.ruleForm;
+      const { good_code, supplierNo, platform_id } = this.ruleForm;
       let model = {
-        skuCode,
+        skuCode: good_code,
         companyNo: supplierNo,
         platform_id,
       };
@@ -957,8 +958,8 @@ export default {
         let list =
           data && data.length > 0 ? JSON.parse(JSON.stringify(data)) : [];
         list.forEach((a) => {
-          a.value = a.activity_name;
-          a.label = a.activity_code;
+          a.value = a.activity_code;
+          a.label = a.activity_name;
         });
         this.goodtype_options[1].children = list;
       } else if (code >= 100 && code <= 104) {
@@ -1017,9 +1018,68 @@ export default {
       } else {
       }
     },
+    //商品类型选择
+    async handleChange(e) {
+      const { goodtype, good_num } = this.ruleForm;
+      if (good_num === "0" || good_num === "") {
+        this.ruleForm.good_price = "0";
+      } else {
+        if (goodtype.length === 2) {
+          let key_1 = goodtype[1];
+          if (key_1 === "1" || key_1 === "2") {
+            this.ruleForm.good_price = "0";
+          } else {
+            const { isok, price } = await this.set_salegetprice();
+            this.ruleForm.good_price = isok ? price : "0";
+          }
+        } else {
+          this.ruleForm.good_price = "0";
+        }
+      }
+    },
+    async number_change(e, key) {
+      this.ruleForm[key] = e + "" || "0";
+      this.$refs.ruleForm.validateField(key);
+      const { goodtype, good_num } = this.ruleForm;
 
-    handleChange(e) {
-      console.log(e);
+      if (good_num === "0" || good_num === "") {
+        this.ruleForm.good_price = "0";
+      } else {
+        if (goodtype.length === 2) {
+        
+          let key_1 = goodtype[1];
+          if (key_1 === "2" || key_1 === "3") {
+            this.ruleForm.good_price = "0";
+          } else {
+            const { isok, price } = await this.set_salegetprice();
+            this.ruleForm.good_price = isok ? price : "0";
+          }
+        } else {
+          this.ruleForm.good_price = "0";
+        }
+      }
+    },
+    async get_goods_active() {
+      const { good_code, supplierNo, platform_id } = this.ruleForm;
+      let model = {
+        skuCode: good_code,
+        companyNo: supplierNo,
+        platform_id,
+      };
+      let { code, data, message } = await asyncRequest.goods_active(model);
+      if (code === 0) {
+        let list =
+          data && data.length > 0 ? JSON.parse(JSON.stringify(data)) : [];
+        list.forEach((a) => {
+          a.value = a.activity_code;
+          a.label = a.activity_name;
+        });
+        this.goodtype_options[1].children = list;
+      } else if (code >= 100 && code <= 104) {
+        await this.logout();
+      } else {
+        this.$message.warning(message);
+      }
     },
     change_good_code() {
       const { supplierNo, platform_id } = this.ruleForm;
@@ -1116,7 +1176,13 @@ export default {
             JSON.stringify(this.ruleForm)
           );
           const { order_addr } = JSON.parse(JSON.stringify(this.addrForm));
-
+          if (sendtype.length !== 2) {
+            this.$message.warning("请选择商品类型！");
+            this.loading = false;
+            return;
+          }
+          let key_0 = goodtype[0];
+          let key_1 = goodtype[1];
           if (order_addr.length === 0 && sendtype === "1") {
             this.$message.warning("至少填写一条地址信息！");
             this.loading = false;
@@ -1125,6 +1191,7 @@ export default {
           let model = JSON.parse(JSON.stringify(this.ruleForm));
           model.addrlist = [];
           model.customer_code = model.customer_code.toString();
+
           delete model["proof_type"];
           delete model["proof_url"];
           delete model["good_price"];
@@ -1160,10 +1227,13 @@ export default {
           }
           let priceres = await this.set_salegetprice();
           if (!priceres.isok) {
+            this.loading = false;
             return;
           }
+          model.is_activity = key_0 === "is_activity_0" ? "0" : "1";
+          model.goodtype = key_0 === "is_activity_1" ? "1" : key_1;
+          model.act_code = key_0 === "is_activity_1" ? Fkey_1 : "";
           let res = await asyncRequest.add(model);
-
           this.loading = false;
           if (res && res.code === 0) {
             this.$notify.success({
@@ -1189,11 +1259,12 @@ export default {
         isok: true,
         price: "0",
       };
-      const { good_num, good_code, is_activity } = this.ruleForm;
+      const { good_num, good_code, goodtype } = this.ruleForm;
+      let key_1 = goodtype[1];
       let model = {
         skuCode: good_code,
         sale_num: good_num,
-        is_activity: "0",
+        is_activity: key_1,
       };
       let { code, message, data } = await asyncRequest.salegetprice(model);
 

src/views/serviceParam/supplier/components/baseForm.vue

@@ -181,7 +181,7 @@
               :src="ruleForm.supplier_img"
               class="avatar hover fl"
               v-viewer
-              style="width: 84px; height: 84px"
+              style="width:50px; height:50px"
             />
             <el-link
               class="fl"
@@ -844,12 +844,12 @@ export default {
       width: 100%;
       li {
         float: left;
-        width: 89px;
-        height: 89px;
+        width: 55px;
+        height: 55px;
         padding: 0 5px 0 0;
         .img-show-li-div {
-          width: 84px;
-          height: 84px;
+          width:50px;
+          height:50px;
           border: 1px solid #dfe4ed;
           background: #dfe4ed;
           position: relative;