Merge branch 'sit'

src/components/search-good-online-modal/main.vue

@@ -90,6 +90,11 @@
                     v-model="sinput"
                     :maxlength="40"
                     placeholder="关键字"
+                    @blur="
+                      pageInfo.curr = 1;
+                      parmValue.page = 1;
+                      searchList();
+                    "
                   >
                     <el-select
                       v-model="select"
@@ -238,7 +243,7 @@ export default {
 
       this.parmValue = {
         platform_code: platform_code || "",
-        companyNo: company_id || "",//业务企业编号
+        companyNo: company_id || "", //业务企业编号
         is_stock: is_stock || "",
         cat_id: [], // 商品属性code
         brandid: [],
@@ -291,6 +296,9 @@ export default {
         model.cat_id.length > 0 ? model.cat_id[model.cat_id.length - 1] : "";
       model.brandid =
         model.brandid.length > 0 ? model.brandid[model.brandid.length - 1] : "";
+      model.good_code = this.select === "2" ? this.sinput : ""; // 商品编码
+      model.good_name = this.select === "1" ? this.sinput : ""; // 商品名称
+      model.platform_code = this.select === "3" ? this.sinput : "";
       // model.platform_code =
       //   model.platform_code.length > 0
       //     ? model.platform_code[model.platform_code.length - 1]

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

@@ -23,15 +23,17 @@
       </el-col>
       <el-col :span="6">
         <el-form-item label="物流公司" prop="post_company">
-          <el-input
-            placeholder="物流公司"
+          <search-express
             :disabled="
               !(status === '5' && powers.some((item) => item == '032'))
             "
-            v-model="ruleForm.post_company"
-            maxlength="100"
-          >
-          </el-input>
+            :value="ruleForm.post_company"
+            :placeholder="'物流公司'"
+            :names="''"
+            :size="'mini'"
+            :is-detail="false"
+            @searchChange="handleCompany"
+          />
         </el-form-item>
       </el-col>
       <el-col :span="10">
@@ -62,7 +64,7 @@
 <script>
 import asyncRequest from "@/apis/service/purchaseIn/wsmInOrder";
 import resToken from "@/mixins/resToken";
-import { isnumber,isAlphanumeric } from "@/utils/validate";
+import { isnumber, isAlphanumeric } from "@/utils/validate";
 export default {
   name: "wsmInOrderAdd",
   props: ["id", "sitem", "newTime", "modelSitem"],
@@ -112,7 +114,7 @@ export default {
       modelId: "",
       ruleForm: {
         return_num: "",
-        post_company: "",
+        post_company: [],
         post_code: "",
       },
       rules: {
@@ -123,8 +125,8 @@ export default {
         },
         post_company: {
           required: true,
-          message: "请输入物流公司",
-          trigger: "blur",
+          message: "请选择物流公司",
+          trigger: "change",
         },
         post_code: {
           required: true,
@@ -173,13 +175,17 @@ export default {
           this.ruleForm = {
             wsm_in_code: wsm_in_code || "",
             return_num: return_num || "0",
-            post_company: post_company || "",
+            post_company: post_company ? [post_company] : [],
             post_code: post_code || "",
           };
         }
       });
     },
-
+    handleCompany(e) {
+      const { code, label } = e;
+      this.ruleForm.post_company = code ? [label] : [];
+      this.$refs.ruleForm.validateField("post_company");
+    },
     // 保存更改
     async submitForm() {
       await this.$refs.ruleForm.validate(async (valid) => {

src/views/purchaseIn/wsmInOrder/detail.vue

@@ -329,7 +329,7 @@ export default {
       if (res && res.code === 0 && res.data) {
         this.sitem = res.data;
         const { status, can, wsm_in_code } = this.sitem;
-        this.status = "1";
+        this.status = status;
         this.orderCode = wsm_in_code;
         if (can && can.length > 0) {
           this.sitem.class_cat = "";

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

@@ -16,10 +16,7 @@
           <search-work-company
             :value="ruleForm.companyNo"
             :placeholder="'销售方公司'"
-            :disabled="
-              type === 'view' ||
-              (type === 'edit' && ruleForm.is_project === '1')
-            "
+            :disabled="type === 'view' || type === 'edit'"
             :size="'mini'"
             :isDetail="type === 'view' || type === 'edit'"
             @searchChange="company_idsearchChange"
@@ -34,10 +31,7 @@
             :placeholder="'购买方公司'"
             :size="'mini'"
             @searchChange="customerChange"
-            :disabled="
-              type === 'view' ||
-              (type === 'edit' && ruleForm.is_project === '1')
-            "
+            :disabled="type === 'view' || type === 'edit'"
             :is-detail="type === 'view' || type === 'edit'"
           />
         </el-form-item>
@@ -46,10 +40,7 @@
         <el-form-item label="所属平台" prop="platform_code">
           <search-terrace
             :value="ruleForm.platform_code"
-            :disabled="
-              type === 'view' ||
-              (type === 'edit' && ruleForm.is_project === '1')
-            "
+            :disabled="type === 'view' || type === 'edit'"
             :size="'mini'"
             :isDetail="type === 'view' || type === 'edit'"
             :names="platform_name"
@@ -80,7 +71,6 @@
             placeholder="咨询类型"
             clearable
             :disabled="type === 'view' || type === 'edit'"
-            @change="is_project_change"
           >
             <el-option
               v-for="item in options"
@@ -233,7 +223,7 @@
                   (type === 'edit' && ruleForm.is_project === '1')
                 "
                 value-format="yyyy-MM-dd"
-                :picker-options="pickerOptions"
+                :picker-options="pickerOptions1"
                 placeholder="到货日期"
               >
               </el-date-picker>
@@ -273,7 +263,7 @@
                 "
                 :controls="false"
                 :append="'元'"
-                @reschange="budget_price_change"
+                @reschange="digitalInput($event, 'budget_price')"
               />
             </el-form-item>
           </el-col>
@@ -293,7 +283,7 @@
                 "
                 :controls="false"
                 :append="''"
-                @reschange="num_change"
+                @reschange="digitalInput($event, 'num')"
               />
             </el-form-item>
           </el-col>
@@ -303,7 +293,7 @@
               <search-brand
                 :value="ruleForm.brand_id"
                 :size="'mini'"
-                :isDetail="type === 'view'"
+                :isDetail="type === 'view' || type === 'edit'"
                 :names="brand_name"
                 :disabled="type === 'view' || type === 'edit'"
                 :placeholder="'品牌'"
@@ -342,7 +332,7 @@
                 :size="'mini'"
                 :append="'g'"
                 :disabled="type === 'view'"
-                @reschange="total_weight_change"
+                @reschange="digitalInput($event, 'total_weight')"
               />
             </el-form-item>
           </el-col>
@@ -498,7 +488,7 @@
                     :size="'mini'"
                     :disabled="type === 'view'"
                     :append="'g'"
-                    @reschange="specs_weight_change"
+                    @reschange="digitalInput($event, 'specs_weight')"
                   />
                 </el-form-item>
               </el-col>
@@ -636,6 +626,7 @@ export default {
   },
   data() {
     return {
+      od_form: null,
       unit_name: "",
       modelIndex: "",
       modelSitem: {},
@@ -776,7 +767,10 @@ export default {
     handleSelectionChange(val) {
       this.multipleSelection = val;
     },
-
+    async digitalInput(e, key) {
+      this.ruleForm[key] = e + "" || "0";
+      this.$refs.ruleForm.validateField(key);
+    },
     sch_is_noble() {
       this.rulesThis["projectNo"][0].required =
         this.ruleForm.is_project === "1";
@@ -799,14 +793,6 @@ export default {
       }
     },
 
-    //咨询类型选择
-    is_project_change() {
-      const { is_project } = this.ruleForm;
-      if (is_project === "0") {
-      } else {
-        // this.ptableData = [];
-      }
-    },
     async resetForm() {
       this.resign_name = "";
       this.hand_name = "";
@@ -860,7 +846,7 @@ export default {
             p_good_img,
             p_arrtime,
             specinfo,
-          } = this.sitem;
+          } = JSON.parse(JSON.stringify(this.sitem));
           this.unit_name = unit_name;
           this.brand_name = brand;
           this.spec_tableData =
@@ -926,6 +912,8 @@ export default {
           if (this.ruleForm.projectNo && this.ruleForm.projectNo.length === 1) {
             await this.selectChange(this.ruleForm.projectNo);
           }
+
+          this.od_form = JSON.parse(JSON.stringify(this.ruleForm));
         }
       });
     },
@@ -987,9 +975,18 @@ export default {
           delete model["arrtime"];
           delete model["puse_desc"];
           delete model["budget_total"];
+          delete model["khname"];
+
           this.loading = false;
           console.log(model);
-
+          console.log(this.sitem);
+          Object.keys(model).forEach((key) => {
+            if (model[key] !== this.sitem[key]) {
+              console.log(key + "---" + model[key] + "----" + this.sitem[key]);
+            }
+          });
+          // this.loading = false;
+          // return;
           const res = await asyncRequest.update(model);
           this.loading = false;
           if (res && res.code === 0) {
@@ -1142,6 +1139,12 @@ export default {
       this.ruleForm.brand_id = id ? [id] : [];
       this.$refs.ruleForm.validateField("brand_id");
     },
+    unitsearchChange(e) {
+      const { code, label } = e;
+      this.ruleForm.unit = code ? [code] : [];
+      this.unit_name = label || "";
+      this.$refs.ruleForm.validateField("unit");
+    },
     //销售方公司选择
     company_idsearchChange(e) {
       if (e) {
@@ -1162,7 +1165,6 @@ export default {
       this.$refs.ruleForm.validateField("khNo");
       this.ruleForm.projectNo = [];
       this.ruleForm.budget_total = "0";
-      this.ruleForm.use_desc = "";
       this.ruleForm.pendtime = "";
       this.ruleForm.arrtime = "";
       this.ptableData = [];
@@ -1184,6 +1186,48 @@ export default {
       this.$refs.ruleForm.validateField("cat_id");
       this.is_noble = pid === "6";
     },
+    //判断图片规格
+    beforeAvatarUpload(file) {
+      let isJPG = false,
+        isLt2M = false;
+      if (file) {
+        if (
+          file.type === "image/jpg" ||
+          file.type === "image/png" ||
+          file.type === "image/jpeg"
+        ) {
+          isJPG = true;
+        }
+        isLt2M = file.size / 1024 / 1024 < 1;
+        if (!isJPG) {
+          this.$message.error("图片格式不正确！");
+        }
+        if (!isLt2M) {
+          this.$message.error("图片大小不能超过 1MB!");
+        }
+      }
+
+      return isJPG && isLt2M;
+    },
+    //图片上传失败
+    UploadErrorEvent(res) {
+      if (res !== "break") {
+        this.$message.error("图片上传失败!");
+        this.ruleForm.good_img = "";
+        this.$refs.ruleForm.validateField("good_img");
+      }
+    },
+    //图片上传成功
+    async UploadSuccessEvent(data) {
+      const { url } = data;
+      if (url === "noToken") {
+        await this.logout();
+      } else {
+        this.ruleForm.good_img = url;
+        this.$message.success("图片上传成功!");
+        this.$refs.ruleForm.validateField("good_img");
+      }
+    },
   },
 };
 </script>