Merge branch 'sit'

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

@@ -444,8 +444,8 @@ export default {
             });
           }
           this.sitem.cat = cat;
-          // this.sitem.good_img = this.sitem.good_img.split(",");
-
+          //线上商品字段转换
+          this.sitem.good_img = this.sitem.good_img.split(",");
           this.sitem.good_info_img = this.sitem.good_info_img.split(",");
         } else if (code >= 100 && code <= 104) {
           await this.logout();

src/components/search-good-modal/columns.js

@@ -41,7 +41,7 @@ export default [
     label: "税率",
     width: "45px",
   },
-  
+
   {
     prop: "supplierNo",
     label: "供应商编号",
@@ -62,6 +62,12 @@ export default [
     label: "业务公司名称",
     width: "150px",
   },
+  {
+    prop: "creater",
+    label: "采购员",
+    fixed: "right",
+    width: "70px",
+  },
 
 
 ]

src/components/search-good-online-modal/columns.js

@@ -63,4 +63,11 @@ export default [
     label: "业务公司",
     "min-width": "150",
   },
+  {
+    prop: "purchase",
+    label: "采购员",
+    fixed: "right",
+    "width": "70",
+  },
+  
 ]

src/views/goodStore/goodsCost/columns.js

@@ -473,11 +473,11 @@ const rules = {
       trigger: "blur",
     },
   ],
-  is_step: {
-    required: true,
-    message: "请选择是否启用阶梯",
-    trigger: "change",
-  },
+  // is_step: {
+  //   required: true,
+  //   message: "请选择是否启用阶梯",
+  //   trigger: "change",
+  // },
 }
 
 export { options1, options2, options3, options4, options5, options6, options7, options8, options9, listCol, rules }

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

@@ -845,7 +845,7 @@
     </el-row>
     <el-row class="ddiv">
       <el-col :span="1" class="dtitle">
-        <ul>
+        <ul style="padding:0;">
           <li>固</li>
           <li>定</li>
           <li>与</li>
@@ -930,7 +930,7 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="6">
+          <!-- <el-col :span="6">
             <el-form-item label="启用阶梯" prop="is_step">
               <el-select
                 v-model="ruleForm.is_step"
@@ -948,7 +948,7 @@
                 />
               </el-select>
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col
             :span="6"
             v-show="is_noble && ruleForm && ruleForm.is_gold_price === '1'"
@@ -1176,11 +1176,11 @@ export default {
       this.showModel = true;
     },
     openCostEdit(index, sitem) {
-      const { is_step } = this.ruleForm;
-      if (index === -1 && is_step === "0" && this.ladder_tableData.length > 0) {
-        this.$message.warning("不启用阶梯成本，只能录入一条阶梯成本信息！");
-        return;
-      }
+      // const { is_step } = this.ruleForm;
+      // if (index === -1 && is_step === "0" && this.ladder_tableData.length > 0) {
+      //   this.$message.warning("不启用阶梯成本，只能录入一条阶梯成本信息！");
+      //   return;
+      // }
       this.costmodelIndex = index;
       this.costsitem = sitem;
       this.costshowModel = true;
@@ -1191,20 +1191,20 @@ export default {
     openCostEditDelete(index) {
       this.ladder_tableData.splice(index, 1);
     },
-    is_step_change() {
-      const { is_step } = this.ruleForm;
-      if (is_step === "0") {
-        let res = [];
-        let list =
-          this.ladder_tableData.length === 0
-            ? []
-            : JSON.parse(JSON.stringify(this.ladder_tableData));
-        if (list.length > 0) {
-          res.push(list[0]);
-        }
-        this.ladder_tableData = res;
-      }
-    },
+    // is_step_change() {
+    //   const { is_step } = this.ruleForm;
+    //   if (is_step === "0") {
+    //     let res = [];
+    //     let list =
+    //       this.ladder_tableData.length === 0
+    //         ? []
+    //         : JSON.parse(JSON.stringify(this.ladder_tableData));
+    //     if (list.length > 0) {
+    //       res.push(list[0]);
+    //     }
+    //     this.ladder_tableData = res;
+    //   }
+    // },
     async submitForm() {
       this.sch_is_noble();
       this.good_type_change();
@@ -1234,11 +1234,11 @@ export default {
           }
           const { noble_weight, weight, good_type, moq, is_step } =
             this.ruleForm;
-          if (is_step === "0" && this.ladder_tableData.length > 1) {
-            this.$message.warning("不启用阶梯成本，只能录入一条阶梯成本信息！");
-            this.loading = false;
-            return;
-          }
+          // if (is_step === "0" && this.ladder_tableData.length > 1) {
+          //   this.$message.warning("不启用阶梯成本，只能录入一条阶梯成本信息！");
+          //   this.loading = false;
+          //   return;
+          // }
           if (this.is_noble) {
             if (noble_weight * 1000 > weight * 1000) {
               this.$message.warning("贵金属总重量不能大于商品总重量！");
@@ -1615,7 +1615,7 @@ export default {
         market_price: "0",
         cgd_gold_price: "0",
         noble_price: "0",
-        is_step: "0",
+        // is_step: "0",
         is_diff: "",
         config: [],
         other_config: "",
@@ -1683,7 +1683,7 @@ export default {
             market_price, //	string	市场价
             cgd_gold_price, //	string	供应商采购金价
             noble_price,
-            is_step, //	string	是否使用阶梯价
+            // is_step, //	string	是否使用阶梯价
             // is_online, //	string	是否上线
             status, //		string	状态
             nakelist, //阶梯成本
@@ -1800,7 +1800,7 @@ export default {
             market_price: market_price || "",
             cgd_gold_price: cgd_gold_price || "",
             noble_price: noble_price || "0",
-            is_step: is_step || "0",
+            // is_step: is_step || "0",
             is_diff: is_diff || "",
             config: config ? config.split(",") : [],
             other_config: other_config || "",
@@ -1843,7 +1843,7 @@ export default {
         delete item["is_gold_price"];
         delete item["market_price"];
         delete item["cgd_gold_price"];
-        delete item["is_step"];
+        // delete item["is_step"];
         delete item["good_ladder"];
       } else {
         const {
@@ -1854,7 +1854,7 @@ export default {
           is_gold_price,
           market_price,
           cgd_gold_price,
-          is_step,
+          // is_step,
           good_ladder,
           spuCode,
         } = model;
@@ -1866,7 +1866,7 @@ export default {
           is_gold_price: is_gold_price || "",
           market_price: market_price || "",
           cgd_gold_price: cgd_gold_price || "",
-          is_step: is_step || "",
+          // is_step: is_step || "",
           good_ladder: good_ladder || [],
           spuCode: spuCode || "",
         };

src/views/goodStore/goodsOnline/columns.js

@@ -111,7 +111,11 @@ const listCol = [
     label: "平台商品编号",
     width: "150px",
   },
-
+  {
+    prop: "purchase",
+    label: "采购员",
+    width: "70px",
+  },
   {
     prop: "creater",
     label: "创建人",

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

@@ -170,7 +170,7 @@
               :size="'mini'"
               border
               style="width: 100%"
-              height="120px"
+              max-height="120px"
             >
               <el-table-column prop="spec_name" label="规格类型" />
               <el-table-column prop="spec_value_name" label="规格值" />

src/views/purchaseIn/workbench/detail.vue

@@ -178,9 +178,7 @@
                   v-if="scope.row.bargain_status === '0'"
                   >新建信息</el-tag
                 >
-                <el-tag type="danger" :size="'mini'" v-else
-                  >待确认</el-tag
-                >
+                <el-tag type="danger" :size="'mini'" v-else>待确认</el-tag>
               </template></el-table-column
             >
 
@@ -309,6 +307,7 @@ export default {
         infoNo: "",
         bidNo: "",
         projectNo: "",
+        is_own: "1",
       },
     };
   },
@@ -419,6 +418,7 @@ export default {
     async searchList() {
       this.loading = true;
       this.parmValue.infoNo = this.queryId;
+
       const { code, data, message } = await asyncRequest.good_list(
         this.parmValue
       );

src/views/sellOut/bargainList/index.vue

@@ -210,11 +210,11 @@ export default {
       s_input: "",
       customerCode: [], //客户公司code
       options: [
-        { id: "1", label: "待主管审批" },
+        { id: "1", label: "待业务主管审批" },
         { id: "2", label: "待财务专员审批" },
         { id: "3", label: "待财务主管审批" },
         { id: "4", label: "审批通过" },
-        { id: "5", label: "主管驳回" },
+        { id: "5", label: "业务主管驳回" },
         { id: "6", label: "财务主管驳回" },
         { id: "7", label: "已取消议价" },
       ],

src/views/sellOut/sellAfterApply/components/express_feedback.vue

@@ -58,7 +58,10 @@
         <el-col :span="12">
           <el-form-item label="收件人" prop="contactor">
             <el-input
-              :disabled="return_tag === '2'"
+              :disabled="
+                return_tag === '2' ||
+                !(status === '3' && powers.some((item) => item == '083'))
+              "
               v-model="ruleForm.contactor"
               placeholder="收件人"
             ></el-input>
@@ -67,7 +70,10 @@
         <el-col :span="12">
           <el-form-item label="收件人电话" prop="mobile">
             <el-input
-              :disabled="return_tag === '2'"
+              :disabled="
+                return_tag === '2' ||
+                !(status === '3' && powers.some((item) => item == '083'))
+              "
               v-model="ruleForm.mobile"
               placeholder="收件人电话"
             ></el-input>
@@ -81,14 +87,20 @@
               :is-detail="true"
               :size="'mini'"
               @selectChange="addr_selectChange"
-              :disabled="return_tag === '2'"
+              :disabled="
+                return_tag === '2' ||
+                !(status === '3' && powers.some((item) => item == '083'))
+              "
             />
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label-width="10px" prop="addr">
             <el-input
-              :disabled="return_tag === '2'"
+              :disabled="
+                return_tag === '2' ||
+                !(status === '3' && powers.some((item) => item == '083'))
+              "
               v-model="ruleForm.addr"
               maxlength="250"
               placeholder="退回地址"
@@ -121,17 +133,7 @@ export default {
       if (value === "") {
         callback(new Error("收件人不能为空！"));
       } else {
-        if (value.length < 2 || value.length > 12) {
-          callback(new Error("收件人规则为2~12位汉字！"));
-        } else {
-          if (!isChinese(value)) {
-            callback(new Error("收件人规则为2~12位汉字！"));
-          } else if (isEmoticon(value)) {
-            callback(new Error("收件人规则为2~12位汉字！"));
-          } else {
-            callback();
-          }
-        }
+        callback();
       }
     };
     const validatemobile = (rule, value, callback) => {
@@ -257,7 +259,7 @@ export default {
             return_wsm,
             addr,
             mobile,
-            contactor_name,
+            contactor,
             wsm_supplierNo,
             wsm_supplier,
             wsm_name,
@@ -276,18 +278,15 @@ export default {
             returnCode: returnCode || "",
             wsm_code: return_wsm ? [return_wsm] : [],
             wsm_supplierNo: wsm_supplierNo ? [wsm_supplierNo] : [],
-            contactor: contactor_name || "",
+            contactor: contactor || "",
             mobile: mobile || "",
             addr: addr || "",
             addr_code: [],
           };
-          if (addrs_code) {
-            const { provice_code, city_code, area_code } = addrs_code;
-
+          if (addr_code) {
+            let code_arr = addr_code.split(",");
             this.ruleForm.addr_code =
-              addrs_code && provice_code && city_code && area_code
-                ? [provice_code, city_code, area_code]
-                : [];
+              code_arr && code_arr.length === 3 ? code_arr : [];
           }
           this.rulesThis.wsm_supplierNo[0].required = this.return_tag === "2";
           this.rulesThis.wsm_code[0].required = this.return_tag === "2";

src/views/sellOut/sellAfterApply/components/returnExpress.vue

@@ -1,296 +0,0 @@
-<template>
-  <el-form
-    ref="ruleForm"
-    :loading="loading"
-    :model="ruleForm"
-    status-icon
-    :rules="rulesThis"
-    label-width="100px"
-    style="width: 100%"
-    class="demo-ruleForm"
-  >
-    <el-row>
-      <el-col :span="12">
-        <el-form-item label="费用承担方" prop="own">
-          <el-select
-            @change="handleChange"
-            v-model="ruleForm.own"
-            placeholder="费用承担方"
-            :disabled="
-              !(status === '3' && powers.some((item) => item == '040'))
-            "
-            style="width: 100%"
-          >
-            <el-option
-              v-for="item in options"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            >
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="物流单号" prop="post_code">
-          <el-input
-            placeholder="物流单号"
-            :disabled="
-              !(status === '3' && powers.some((item) => item == '040'))
-            "
-            v-model="ruleForm.post_code"
-          ></el-input>
-        </el-form-item>
-      </el-col>
-      <el-col :span="12">
-        <el-form-item label="物流公司" prop="company">
-          <search-express
-            :value="ruleForm.company"
-            :placeholder="'物流公司'"
-            :names="''"
-            :disabled="
-              !(status === '3' && powers.some((item) => item == '040'))
-            "
-            :is-detail="
-              !(status === '3' && powers.some((item) => item == '040'))
-            "
-            @searchChange="handleCompany"
-          />
-        </el-form-item>
-      </el-col>
-      <el-col :span="12" v-if="ruleForm.own === '2'">
-        <el-form-item label="物流费用" prop="post_fee">
-          <el-input
-            placeholder="物流费用"
-            :disabled="
-              !(status === '3' && powers.some((item) => item == '040'))
-            "
-            v-model="ruleForm.post_fee"
-          >
-            <template slot="append">元</template>
-          </el-input>
-        </el-form-item>
-      </el-col>
-    </el-row>
-    <el-row>
-      <el-col
-        :span="24"
-        style="text-align: right; margin: 0 0 10px 0"
-        v-if="status === '3' && powers.some((item) => item == '040')"
-      >
-        <el-button type="primary" @click="submitForm" size="mini"
-          >保 存</el-button
-        >
-      </el-col>
-    </el-row>
-  </el-form>
-</template>
-<script>
-import asyncRequest from "@/apis/service/sellOut/sellAfterApply";
-import resToken from "@/mixins/resToken";
-import { isAlphanumeric, isnumber, isnumber2 } from "@/utils/validate.js";
-export default {
-  name: "sellAfterApplyDetail",
-  props: ["id", "newTime", "sitem"],
-  mixins: [resToken],
-  data() {
-    const validateexpress = (rule, value, callback) => {
-      if (value === "") {
-        callback(new Error("物流单号不能为空！"));
-      } else {
-        if (!isAlphanumeric(value)) {
-          callback(new Error("物流单号格式不正确！"));
-        } else {
-          callback();
-        }
-      }
-    };
-    const validateexpressFee = (rule, value, callback) => {
-      if (value === "") {
-        callback(new Error("物流费用不能为空！"));
-      } else {
-        if (isnumber(value)) {
-          callback();
-        } else if (isnumber2(value)) {
-          callback();
-        } else {
-          callback(new Error("物流费用仅支持整数及两位小数！"));
-        }
-      }
-    };
-    return {
-      options: [
-        {
-          value: "1",
-          label: "个人承担",
-        },
-        {
-          value: "2",
-          label: "购买方公司承担",
-        },
-      ],
-      code: "",
-      isShow: false,
-      loading: false,
-      status: "", //存储详情接口返的状态
-      showModelThis: this.showModel,
-      resign_name: "", //离职人
-      hand_name: "", //交接人
-      ruleForm: {
-        returnCode: "",
-        own: "1", //物流费用承担方
-        company: [], //物流公司
-        post_code: "", //物流单号
-        post_fee: 0, //物流费用
-      },
-      rulesThis: this.rules,
-      // 验证规则
-      rules: {
-        own: [
-          {
-            required: true,
-            trigger: "change",
-            message: "请选择物流费用承担方",
-          },
-        ],
-        company: [
-          {
-            type: "array",
-            required: true,
-            trigger: "change",
-            message: "请选择物流公司",
-          },
-        ],
-        post_code: [
-          {
-            required: true,
-            trigger: "blur",
-            validator: validateexpress,
-          },
-        ],
-        post_fee: [
-          {
-            required: true,
-            trigger: "blur",
-            validator: validateexpressFee,
-          },
-        ],
-      },
-    };
-  },
-  computed: {
-    powers() {
-      let tran =
-        this.$store.getters.btnList.find(
-          (item) => item.menu_route == "sellAfterApplyDetail"
-        ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
-    },
-  },
-
-  mounted() {
-    this.initForm();
-  },
-  watch: {
-    id: function (val) {
-      if (val) {
-        this.initForm();
-      }
-    },
-    newTime: function (val) {
-      if (val) {
-        this.initForm();
-      }
-    },
-  },
-  methods: {
-    //   关闭弹窗,直接隐藏表单
-    // async closeAddEdit() {
-    //   this.$emit("closeModel", false); //抛出一个事件，关闭弹窗
-    //
-    // },
-    closeAdd() {
-      this.showModelThis = false;
-    },
-    async initForm() {
-      this.loading = true;
-      this.status = "";
-      this.rulesThis = this.rules;
-      await this.resetForm();
-      this.loading = false;
-    },
-
-    async resetForm() {
-      // 重置
-      await this.$nextTick(() => {
-        if (this.$refs.ruleForm) {
-          this.$refs.ruleForm.resetFields();
-          this.$refs.ruleForm.clearValidate();
-          this.code = this.returnCode;
-          const {
-            returnCode,
-            post_own,
-            post_company,
-            post_code,
-            post_fee,
-            status,
-          } = this.sitem;
-          this.status = status;
-          this.ruleForm = {
-            returnCode: returnCode || "",
-            own: post_own || "1",
-            company: post_company ? [post_company] : [], //物流公司
-            post_code: post_code || "", //物流单号
-            post_fee: post_fee || "0", //物流费用
-          };
-        }
-      });
-    },
-    async submitForm() {
-      await this.$refs.ruleForm.validate(async (valid) => {
-        if (valid) {
-          let model = JSON.parse(JSON.stringify(this.ruleForm));
-          // model.returnCode = this.code;
-          // delete model["company"];
-          model.company = model.company[0];
-          const res = await asyncRequest.afterPost(model); //售后快递录入
-          this.loading = false;
-          if (res && res.code === 0) {
-            this.$notify.success({
-              title: res.message,
-              message: "",
-            });
-            this.$emit("refresh");
-          } else if (res && res.code >= 100 && res.code <= 104) {
-            await this.logout();
-          } else {
-            this.$message.warning(res.message);
-          }
-        } else {
-          console.log("error submit!!");
-          return false;
-        }
-      });
-    },
-    handleCompany(e) {
-      console.log(e);
-      if (e && e.code) {
-        // this.ruleForm.company = e.shortName;
-        this.ruleForm.company = [e.label];
-      }
-    },
-    handleChange(e) {
-      if (e && e == "2") {
-        this.isShow = true;
-      } else {
-        this.isShow = false;
-      }
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-</style>

src/views/sellOut/sellOutOrder/components/returnExpress.vue

@@ -11,25 +11,6 @@
     class="demo-ruleForm"
   >
     <el-row>
-      <el-col :span="6">
-        <el-form-item label="费用承担方" prop="express_bear">
-          <el-select
-            clearable
-            @change="handleChange"
-            v-model="ruleForm.express_bear"
-            placeholder="费用承担方"
-            style="width: 100%"
-          >
-            <el-option
-              v-for="item in options"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            >
-            </el-option>
-          </el-select>
-        </el-form-item>
-      </el-col>
       <el-col :span="6">
         <el-form-item label="物流公司" prop="express_company">
           <search-express
@@ -53,13 +34,23 @@
       </el-col>
       <el-col :span="6" v-if="isShow">
         <el-form-item label="物流费用" prop="express_fee">
-          <el-input placeholder="物流费用" v-model="ruleForm.express_fee">
-            <template slot="append">元</template>
-          </el-input>
+          <digital-input
+            :values="ruleForm.express_fee"
+            :placeholder="'物流费用'"
+            :min="0"
+            :disabled="false"
+            :max="100000000000"
+            :position="'right'"
+            :precision="2"
+            :size="'mini'"
+            :controls="false"
+            :append="'元'"
+            @reschange="number_change($event, 'lead_time')"
+          />
         </el-form-item>
       </el-col>
 
-      <el-col :span="isShow ? 24 : 6" style="text-align: right">
+      <el-col :span="isShow ? 6 : 12" style="text-align: right">
         <el-button type="primary" :size="'mini'" @click="submitForm" v-if="true"
           >保 存</el-button
         >
@@ -73,7 +64,7 @@ import resToken from "@/mixins/resToken";
 import { isAlphanumeric, isnumber } from "@/utils/validate.js";
 export default {
   name: "purchase_check",
-  props: ["id", "showModelThis", "newTime", "returnCode"],
+  props: ["id", "showModelThis", "newTime", "sitem"],
   mixins: [resToken],
   data() {
     const validateexpress = (rule, value, callback) => {
@@ -87,15 +78,12 @@ export default {
         }
       }
     };
-    const validateexpressFee = (rule, value, callback) => {
-      if (value === "") {
-        callback(new Error("物流费用不能为空！"));
+    const validate_num = (rule, value, callback) => {
+      const { required } = rule;
+      if (required && value === "") {
+        callback(new Error("不能为空！"));
       } else {
-        if (!isnumber(value)) {
-          callback(new Error("物流费用只能为数字！"));
-        } else {
-          callback();
-        }
+        callback();
       }
     };
     return {
@@ -113,6 +101,7 @@ export default {
           label: "供应商承担",
         },
       ],
+      returnCode: "",
       code: "",
       isShow: false,
       loading: false,
@@ -122,23 +111,14 @@ export default {
       hand_name: "", //交接人
       ruleForm: {
         post_company: "", //入参快递公司
-
-        express_bear: "", //物流费用承担方
         express_company: [], //物流公司
         express_numbres: "", //物流单号
         express_fee: 0, //物流费用
+        is_th: "",
       },
       rulesThis: this.rules,
       // 验证规则
       rules: {
-        express_bear: [
-          {
-            // type: "array",
-            required: true,
-            trigger: "change",
-            message: "请选择物流费用承担方",
-          },
-        ],
         express_company: [
           {
             type: "array",
@@ -158,7 +138,7 @@ export default {
           {
             required: true,
             trigger: "blur",
-            validator: validateexpressFee,
+            validator: validate_num,
           },
         ],
       },
@@ -225,16 +205,19 @@ export default {
         if (this.$refs.ruleForm) {
           this.$refs.ruleForm.resetFields();
           this.$refs.ruleForm.clearValidate();
-          this.code = this.returnCode;
+          const { returnCode, is_th, company, post_code, post_fee } =
+            this.sitem;
+          this.is_th = is_th;
+          this.returnCode = returnCode;
           this.ruleForm = {
-            express_bear: "",
             post_company: "", //入参快递公司
-            express_company: [], //物流公司
-            express_numbres: "", //物流单号
-            express_fee: "0", //物流费用
-            type: "",
-            name: "",
+            express_company: company ? [company] : [], //物流公司
+            express_numbres: post_code || "", //物流单号
+            express_fee: post_fee || "0", //物流费用
+            is_th: is_th || "",
           };
+          this.isShow = is_th !== "1";
+          this.rulesThis.express_fee[0].required = is_th !== "1";
         }
       });
     },
@@ -244,10 +227,10 @@ export default {
           let model = JSON.parse(JSON.stringify(this.ruleForm));
           let _model = {
             returnCode: this.returnCode, //退货单号
-            is_th: model.express_bear, //费用承担方
             company: model.post_company, //快递公司
             post_code: model.express_numbres, //快递编号
             post_fee: model.express_fee || 0, //快递费用
+            is_th: this.is_th,
           };
           const res = await asyncRequest.setdelivery(_model);
           this.loading = false;
@@ -276,6 +259,10 @@ export default {
         this.ruleForm.page = 1;
       }
     },
+    async number_change(e, key) {
+      this.ruleForm[key] = e + "" || "0";
+      this.$refs.ruleForm.validateField(key);
+    },
     handleChange(e) {
       if (e && e == "2") {
         this.isShow = true;

src/views/sellOut/sellOutOrder/detail.vue

@@ -107,12 +107,12 @@
                 returnCode &&
                 returnCode_type &&
                 sitem &&
-                sitem.order_return
+                sitem.order_return&&resitem
               "
             >
               <show-data-table
                 :newTime="newTime"
-                v-if="newTime !== ''"
+                v-if="newTime !== ''&&resitem"
                 :sitem="resitem"
                 :border="
                   !(
@@ -216,24 +216,13 @@
               <show-data-table
                 :newTime="newTime"
                 v-if="
-                  !(resitem.is_receive === '1' && returnCode_type === '4') ||
-                  !(resitem.is_receive === '1' && returnCode_type === '5')
-                "
-                :sitem="resitem"
-                border
-                :columns="returnShowColumns"
-              >
-              </show-data-table>
-              <show-data-table
-                :newTime="newTime"
-                v-if="
-                  newTime !== '' &&
+                  resitem &&
                   resitem.is_receive === '1' &&
-                  returnCode_type === '5'
+                  (returnCode_type === '4' || returnCode_type === '5')
                 "
                 :sitem="resitem"
                 border
-                :columns="returnShowResColumns"
+                :columns="returnShowColumns"
               >
                 <template slot="is_th">
                   <el-tag
@@ -247,9 +236,29 @@
                     "
                   ></el-tag>
                 </template>
+                <template slot="addr">
+                  <span
+                    >{{ resitem.contactor }}---{{ resitem.mobile }}---{{
+                      resitem.addr_cn
+                    }}{{ resitem.addr }}</span
+                  >
+                </template>
+              </show-data-table>
+              <show-data-table
+                :newTime="newTime"
+                v-if="
+                  newTime !== '' &&
+                  resitem &&
+                  resitem.is_receive === '1' &&
+                  returnCode_type === '5'
+                "
+                :sitem="resitem"
+                border
+                :columns="returnShowResColumns"
+              >
               </show-data-table>
               <return-express
-                :returnCode="returnCode"
+                :sitem="resitem"
                 :newTime="newTime"
                 v-if="newTime !== '' && returnCode_type === '4'"
                 @refresh="initData"
@@ -328,26 +337,22 @@ export default {
       rshowColumns: sellshowColumns,
       returnShowColumns: [
         {
-          prop: "contactor_name",
-          label: "收货联系人",
-          span: 6,
-        },
-        {
-          prop: "mobile",
-          label: "收货联系电话",
+          prop: "is_th",
+          label: "物流承担方",
+          _slot_: "is_th",
           span: 6,
         },
         {
           prop: "addr",
           label: "收货地址",
-          span: 12,
+          _slot_: "addr",
+          span: 18,
         },
       ],
       returnShowResColumns: [
         {
-          prop: "is_th",
-          label: "费用承担方",
-          _slot_: "is_th",
+          prop: "post_fee",
+          label: "退货物流费用",
           span: 6,
         },
         {
@@ -358,12 +363,7 @@ export default {
         {
           prop: "post_code",
           label: "退货物流单号",
-          span: 6,
-        },
-        {
-          prop: "post_fee",
-          label: "退货物流费用",
-          span: 6,
+          span: 12,
         },
       ],
       sitem: null,
@@ -429,11 +429,11 @@ export default {
       is_th_options: [
         {
           value: "1",
-          label: "个人承担",
+          label: "收货人承担",
         },
         {
           value: "2",
-          label: "公司承担",
+          label: "业务公司承担",
         },
         {
           value: "3",

src/views/stock/stockCount/components/dataWeido/index.vue

@@ -97,37 +97,80 @@
           >
             <el-table-column
               label="商品编码"
-              prop="good_code"
-              width="150"
+              prop="spuCode"
+              width="160"
             ></el-table-column>
-            <!-- <el-table-column
-              label="属性编码"
-              prop="good_type_code"
-              width="130"
-            ></el-table-column> -->
+
             <el-table-column
               label="商品名称"
               prop="good_name"
-              min-width="150"
-             show-overflow-tooltip
+              min-width="120"
+              show-overflow-tooltip
             ></el-table-column>
-            <!-- <el-table-column
-              label="商品属性"
+            <el-table-column
+              label="规格"
               prop="attribute"
+              show-overflow-tooltip
               min-width="120"
-            ></el-table-column> -->
+            >
+              <template slot-scope="scope">
+                <span
+                  v-for="(si, sii) in scope.row.specinfo"
+                  :key="sii + si.spec_value_id"
+                  >{{ sii === 0 ? "" : "-" }}{{ si.spec_name }}[{{
+                    si.spec_value
+                  }}]</span
+                >
+              </template>
+            </el-table-column>
+            <el-table-column label="分类" min-width="120" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <span
+                  v-for="(si, sii) in scope.row.can"
+                  :key="sii + si.spec_value_id"
+                  >{{ sii === 0 ? "" : "_" }}{{ si.name }}</span
+                >
+              </template></el-table-column
+            >
             <el-table-column
-              label="分类"
-              prop="sort_f"
+              label="品牌"
+              prop="brand_name"
+              show-overflow-tooltip
               width="100"
             ></el-table-column>
+            <el-table-column
+              label="单位"
+              prop="unit"
+              show-overflow-tooltip
+              width="80"
+            ></el-table-column>
+            <el-table-column
+              label="当前库存"
+              show-overflow-tooltip
+              prop="total_stock"
+              width="80"
+            ></el-table-column>
+            <el-table-column
+              label="待入库存"
+              show-overflow-tooltip
+              prop="wait_in_stock"
+              width="80"
+            ></el-table-column>
+            <el-table-column
+              label="待出库存"
+              show-overflow-tooltip
+              prop="wait_out_stock"
+              width="80"
+            ></el-table-column>
             <el-table-column
               label="可用库存"
+              show-overflow-tooltip
               prop="usable_stock"
               width="80"
             ></el-table-column>
             <el-table-column
               label="在途库存"
+              show-overflow-tooltip
               prop="intra_stock"
               width="80"
             ></el-table-column>

src/views/stock/stockCount/components/spaceCount/columns.js

@@ -1,46 +1,90 @@
 export default [
-     {
-          prop: "supplier_code",
-          label: "供应商编码",
-          width: "140",
-        },
-        {
-          prop: "wsm_code",
-          label: "仓库编码",
-          width: "170",
-        },
-        {
-          prop: "supplier_wsm_name",
-          label: "仓库名称",
-          "min-width": "220",
-        },
-        
-        // {
-        //   prop: "wsm_name",
-        //   label: "仓库名称",
-        // },
-        // {
-        //   prop: "good_code",
-        //   label: "商品编码",
-        //   width: "150",
-        // },
-        // {
-        //   prop: "type_code",
-        //   label: "商品属性编码",
-        //   width: "130",
-        // },
-        {
-          prop: "good_name",
-          label: "商品名称",
-          "min-width": "150",
-        },
-       
-        {
-          prop: "in_total",
-          label: "入库量",
-        },
-        {
-          prop: "out_total",
-          label: "出库量",
-        },
+  {
+    prop: "company_no",
+    label: "仓库业务公司编码",
+    width: "150",
+  },
+  {
+    prop: "company_name",
+    label: "仓库业务公司名称",
+    'min-width': "180"
+  },
+  {
+    prop: "supplier_code",
+    label: "仓库所在公司编码",
+    width: "150",
+  },
+  {
+    prop: "supplier_name",
+    label: "仓库所在公司名称",
+    'min-width': "180"
+  },
+  {
+    prop: "wsm_code",
+    label: "仓库编码",
+    width: '180'
+  },
+  {
+    prop: "wsm_name",
+    label: "仓库名称",
+    'min-width': "100"
+  },
+  {
+    prop: "good_code",
+    label: "商品编码",
+    width: "160",
+  },
+  // {
+  //   prop: "type_code",
+  //   label: "属性编码",
+  //   width: "150",
+  // },
+  {
+    prop: "good_name",
+    label: "商品名称",
+    "min-width": "150",
+  },
+  {
+    prop: "specinfo",
+    label: "规格",
+    "min-width": "150",
+    _slot_: 'specinfo'
+  },
+  {
+    prop: "can",
+    label: "分类",
+    _slot_: 'can',
+    width: "155",
+  },
+  {
+    prop: "brand_name",
+    label: "分类",
+    width: "85",
+  },
+
+  {
+    prop: "unit",
+    label: "单位",
+    width: "50",
+  },
+  {
+    prop: "usable_stock",
+    label: "当前库存",
+    width: "80",
+  },
+  {
+    prop: "wait_in_stock",
+    label: "待入库",
+    width: "80",
+  },
+  {
+    prop: "wait_out_stock",
+    label: "待出库",
+    width: "80",
+  },
+  {
+    prop: "intra_stock",
+    label: "在途库存",
+    width: "80",
+  },
 ]

src/views/stock/stockCount/components/spaceCount/index.vue

@@ -26,16 +26,17 @@
         <template #table-header="{}">
           <div style="width: 100%" class="min">
             <el-row style="padding: 0 0 0 80px">
-              <el-col :span="6" style="width: 303px; padding: 0 0 0 0">
-                <period-date-picker
-                  :start="parmValue.start"
-                  :end="parmValue.end"
-                  :width="'135px'"
+              <el-col :span="12" style="width: 300px">
+                <search-work-company
+                  :value="parmValue.companyNo"
+                  :names="''"
                   :size="searchSize"
-                  @timeReturned="handleTime"
+                  :is-detail="id !== 'add'"
+                  :placeholder="'业务公司'"
+                  @searchChange="supplierChange"
                 />
               </el-col>
-              <el-col :span="10" style="width: 290px">
+              <el-col :span="10" style="width: 330px; padding: 0 0 0 10px">
                 <el-input
                   v-model="parmValue.type_code"
                   :size="searchSize"
@@ -43,16 +44,6 @@
                 />
               </el-col>
 
-              <!-- 刷新 -->
-              <el-col :span="4" style="width: 66px" class="fr">
-                <el-button
-                  :size="searchSize"
-                  type="primary"
-                  label=""
-                  @click="searchList"
-                  >刷新</el-button
-                >
-              </el-col>
               <!-- 重置 -->
               <el-col :span="4" style="width: 66px" class="fr">
                 <el-button
@@ -65,17 +56,7 @@
               </el-col>
             </el-row>
             <el-row style="padding: 10px 0 0 0">
-              <el-col :span="12" style="width: 280px">
-                <search-work-company
-                  :value="parmValue.companyNo"
-                  :names="''"
-                  :size="searchSize"
-                  :is-detail="id !== 'add'"
-                  :placeholder="'业务公司'"
-                  @searchChange="supplierChange"
-                />
-              </el-col>
-              <el-col :span="12" style="width: 310px; padding: 0 0 0 10px">
+              <el-col :span="12" style="width: 380px">
                 <search-supplier
                   :size="searchSize"
                   :placeholder="'供应商公司'"
@@ -84,7 +65,7 @@
                   @searchChange="selectSupplier"
                 />
               </el-col>
-              <el-col :span="12" style="width: 310px; padding-left: 10px">
+              <el-col :span="12" style="width: 330px; padding:0 0 0 10px">
                 <search-stock
                   :isDetail="true"
                   :size="searchSize"
@@ -97,18 +78,32 @@
                   @searchChange="selectStock"
                 />
               </el-col>
+              <!-- 刷新 -->
+              <el-col :span="4" style="width: 66px" class="fr">
+                <el-button
+                  :size="searchSize"
+                  type="primary"
+                  label=""
+                  @click="searchList"
+                  >刷新</el-button
+                >
+              </el-col>
             </el-row>
           </div>
         </template>
-        <template #status="{ scope }">
-          <el-tag
-            :size="tablebtnSize"
-            :type="scope.row.status == '0' ? 'warning' : ''"
-            v-text="
-              (statusOptions.find((item) => item.id == scope.row.status) || {})
-                .label || '--'
-            "
-          ></el-tag>
+        <template #specinfo="{ scope }">
+          <span
+            v-for="(si, sii) in scope.row.specinfo"
+            :key="sii + si.spec_value_id"
+            >{{ sii === 0 ? "" : "-" }}{{ si.spec_name }}[{{
+              si.spec_value
+            }}]</span
+          >
+        </template>
+        <template #can="{ scope }">
+          <span v-for="(si, sii) in scope.row.cat_info" :key="sii + si.id"
+            >{{ sii === 0 ? "" : "-" }}{{ si.name }}</span
+          >
         </template>
       </ex-table>
     </div>

src/views/stock/stockCount/index.vue

@@ -59,7 +59,7 @@ export default {
   },
   data() {
     return {
-      activeName: "productWeido", //默认选中的区间统计选项
+      activeName: "count", //默认选中的区间统计选项
     };
   },
   methods: {},