build

src/components/globalComponents/company-sort/index.vue

@@ -84,7 +84,8 @@ export default {
             code: this.options[index].id + '',
             label: this.options[index].cat_name + '',
             cat_desc: this.options[index].cat_desc,
-            item: this.options[index].item + ''
+            item: this.options[index].item + '',
+            pid: this.options[index].pid + ''
           }
           console.log(model)
           this.$emit('searchChange', model)

src/components/globalComponents/exam-form/main.vue

@@ -1,7 +1,7 @@
 <template>
   <el-form
-    v-loading="loading"
     ref="ruleForm"
+    v-loading="loading"
     :model="ruleForm"
     status-icon
     :rules="rulesThis"
@@ -10,26 +10,26 @@
     :size="size || 'medium'"
   >
     <el-row>
-      <el-col :span="12"
-        ><el-form-item label="审核状态" prop="state">
-          <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-group>
-        </el-form-item>
+      <el-col
+        :span="12"
+      ><el-form-item label="审核状态" prop="state">
+         <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-group>
+       </el-form-item>
         <el-form-item
-          label="驳回节点"
           v-if="ruleForm.state + '' === '0' && isMust"
+          label="驳回节点"
           prop="rebut"
         >
           <el-select
@@ -44,21 +44,20 @@
               :label="item.label"
               :value="item.value"
               :disabled="item.disabled"
-            >
-            </el-option>
+            />
           </el-select>
         </el-form-item>
       </el-col>
       <el-col :span="12">
         <el-form-item
-          label="审核备注"
           v-if="ruleForm.state + '' === '0'"
+          label="审核备注"
           prop="remark"
         >
           <el-input
+            v-model="ruleForm.remark"
             type="textarea"
             placeholder="请输入审核备注"
-            v-model="ruleForm.remark"
             :disabled="disabled"
             maxlength="250"
             :autosize="{ minRows: 3, maxRows: 3 }"
@@ -71,7 +70,7 @@
             :size="'mini'"
             type="primary"
             @click="submitForm"
-            >保 存
+          >保 存
           </el-button>
         </el-form-item>
       </el-col>
@@ -81,8 +80,8 @@
 
 <script>
 export default {
-  name: "exam-form",
-  props: ["size", "statusList", "disabled", "isMust", "labelWidth"],
+  name: 'ExamForm',
+  props: ['size', 'statusList', 'disabled', 'isMust', 'labelWidth'],
   /**
    * 属性集合
    * @param {String}        size             : 组件大小             非必填
@@ -101,102 +100,102 @@ export default {
       loading: false,
       stateList: [
         {
-          value: "1",
-          label: "通过",
+          value: '1',
+          label: '通过'
         },
         {
-          value: "0",
-          label: "驳回",
-        },
+          value: '0',
+          label: '驳回'
+        }
       ],
       showModelThis: this.showModel,
       ruleForm: {
-        state: "1", // 通过or驳回
-        rebut: "", //驳回至
-        remark: "",
+        state: '1', // 通过or驳回
+        rebut: '', // 驳回至
+        remark: ''
       },
       rulesThis: this.rules,
       rules: {
         state: [
           {
             required: true,
-            message: "请选择审核状态",
-            trigger: "change",
-          },
+            message: '请选择审核状态',
+            trigger: 'change'
+          }
         ],
         rebut: [
           {
             required: true,
-            message: "请选择驳回节点",
-            trigger: "change",
-          },
+            message: '请选择驳回节点',
+            trigger: 'change'
+          }
         ],
         remark: [
-          { required: true, message: "请输入审核备注", trigger: "blur" },
+          { required: true, message: '请输入审核备注', trigger: 'blur' },
           {
             min: 1,
             max: 250,
-            message: "长度在 1 到 250 个字符",
-            trigger: "blur",
-          },
-        ],
-      },
-    };
+            message: '长度在 1 到 250 个字符',
+            trigger: 'blur'
+          }
+        ]
+      }
+    }
   },
   watch: {
-    isDetail: function (val, old) {
+    isDetail: function(val, old) {
       if (this.isDetail !== val) {
-        this.options = [];
-        this.selectLoading = false;
+        this.options = []
+        this.selectLoading = false
       }
-    },
+    }
   },
   mounted() {
-    this.initForm();
+    this.initForm()
   },
   methods: {
     async initForm() {
-      this.loading = true;
-      this.rulesThis = this.rules;
-      await this.resetForm();
-      this.stateChange();
-      this.loading = false;
+      this.loading = true
+      this.rulesThis = this.rules
+      await this.resetForm()
+      this.stateChange()
+      this.loading = false
     },
     stateChange() {
-      if (this.ruleForm.state + '' === "1") {
-        this.rulesThis.rebut[0].required = false;
-        this.rulesThis.remark[0].required = false;
+      if (this.ruleForm.state + '' === '1') {
+        this.rulesThis.rebut[0].required = false
+        this.rulesThis.remark[0].required = false
       } else {
-        this.rulesThis.rebut[0].required = true;
-        this.rulesThis.remark[0].required = true;
+        this.rulesThis.rebut[0].required = true
+        this.rulesThis.remark[0].required = true
       }
     },
     async resetForm() {
       // 重置
       await this.$nextTick(() => {
         if (this.$refs.ruleForm) {
-          this.$refs.ruleForm.resetFields();
-          this.$refs.ruleForm.clearValidate();
+          this.$refs.ruleForm.resetFields()
+          this.$refs.ruleForm.clearValidate()
           this.ruleForm = {
-            state: "1", // 通过or驳回
-            rebut: "", //驳回至
-            remark: "",
-          };
+            state: '1', // 通过or驳回
+            rebut: '', // 驳回至
+            remark: ''
+          }
         }
-      });
+      })
     },
     async submitForm() {
-      await this.$refs.ruleForm.validate(async (valid) => {
+      await this.$refs.ruleForm.validate(async(valid) => {
         if (valid) {
-          this.$emit("searchChange", this.ruleForm);
+          this.$emit('searchChange', this.ruleForm)
         } else {
-          console.log("error submit!!");
-          return false;
+          console.log('error submit!!')
+          return false
         }
-      });
-    },
-  },
-};
+      })
+    }
+  }
+}
 </script>
 
 <style>

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

@@ -1972,6 +1972,7 @@ export default {
       this.ruleForm.after_sales = cat_desc || "";
       this.$refs.ruleForm.validateField("after_sales");
       this.is_noble = pid === "6";
+      console.log(pid)
       this.sch_is_noble();
       await this.set_must_spec();
       await this.get_all_fee();
@@ -1981,6 +1982,9 @@ export default {
       let id = cat_id.length == 1 ? cat_id[0] : "";
       if (id) {
         const { code, message, data } = await asyncRequest.catinfo({ id: id });
+        this.ruleForm.after_sales = data.cat_desc
+        this.$refs.ruleForm.validateField('after_sales');
+
         if (code === 0) {
           const { spec } = data;
           if (spec && spec.length > 0) {

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

@@ -1,250 +1,148 @@
 <template>
-  <el-form
-    ref="ruleForm"
-    :loading="loading"
-    :model="ruleForm"
-    status-icon
-    :size="'mini'"
-    :rules="rules"
-    label-width="100px"
-    style="width: 100%"
-    class="demo-ruleForm"
-  >
-    <el-row>
-      <el-col :span="6"
-        ><el-form-item label="审核状态" prop="status">
-          <el-select
-            v-model="ruleForm.status"
-            placeholder="请选择审核状态"
-            style="width: 100%"
-            :size="'mini'"
-            :disabled="!(status + '' == '2' && ppowers.some((i) => i == '2'))"
-            @change="statusChange"
-          >
-            <el-option
-              v-for="item in statusList"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            >
-            </el-option>
-          </el-select>
-        </el-form-item>
-      </el-col>
-      <el-col :span="12" v-show="ruleForm.status + '' === '0'">
-        <el-form-item
-          label="审核备注"
-          :disabled="!(status == '2' && ppowers.some((i) => i == '2'))"
-          prop="remark"
-        >
-          <el-input
-            type="textarea"
-            :size="'mini'"
-            placeholder="请输入审核备注"
-            v-model="ruleForm.remark"
-            :disabled="disabled"
-            maxlength="250"
-            :autosize="{ minRows: 2, maxRows: 2 }"
-            show-word-limit
-          />
-        </el-form-item>
-      </el-col>
-      <el-col :span="6" v-if="status == '2' && ppowers.some((i) => i == '2')" class="tr">
-        <el-button v-if="!isDetail" :size="'mini'" type="primary" @click="submitForm"
-          >保 存
-        </el-button>
-      </el-col>
-    </el-row>
+  <el-form ref="formRef" class="supplier-form" size="mini" label-width="80px" :model="formData" :rules="rules">
+    <el-form-item label="审核状态" prop="status">
+      <el-select v-model="formData.status" style="width:100%">
+        <el-option v-for="opt in statusOptions" :key="opt.value" :value="opt.value" :label="opt.label" />
+      </el-select>
+    </el-form-item>
+    <el-form-item label="审核备注" prop="remark">
+      <el-input v-model="formData.remark" />
+    </el-form-item>
+
+    <template v-if="displayExpressField">
+      <el-form-item label="收货人" prop="contactor">
+        <el-input v-model="formData.contactor" />
+      </el-form-item>
+      <el-form-item label="联系电话" prop="mobile">
+        <el-input v-model="formData.mobile" />
+      </el-form-item>
+      <el-form-item label="退货地址" prop="addr_code">
+        <select-area
+          :placeholder="'省/市/区'"
+          :value="formData.addr_code"
+          :is-detail="true"
+          :size="'mini'"
+          @selectChange="addr_selectChange"
+        />
+      </el-form-item>
+    </template>
   </el-form>
 </template>
 <script>
-import asyncRequest from "@/apis/service/sellOut/sellAfterApply";
-import resToken from "@/mixins/resToken";
+import { isMobile } from '@/utils/validate'
+
 export default {
-  name: "sellAfterApplyDetail",
-  mixins: [resToken],
-  props: ["id", "newTime", "sitem", "show"],
+  name: 'SupplierExam',
+  mixins: [],
+  props: [],
   data() {
-    return {
-      loading: false,
-      is_receive: "1",
-      status: "",
-      statusList: [
-        {
-          value: "1",
-          label: "通过",
-        },
-        {
-          value: "0",
-          label: "驳回",
-        },
-      ],
-      is_th_list: [
-        {
-          value: "1",
-          label: "收货人承担",
-        },
-        {
-          value: "2",
-          label: "业务公司承担",
-        },
-        {
-          value: "3",
-          label: "供应商承担",
-        },
-      ],
-      return_tag_options: [
-        {
-          value: "1",
-          label: "供应商仓库",
-        },
-        {
-          value: "2",
-          label: "业务公司仓库",
-        },
-      ],
+    const validatename = (rule, value, callback) => {
+      if (value === '') {
+        callback(new Error('收件人不能为空！'))
+      } else {
+        callback()
+      }
+    }
+    const validatemobile = (rule, value, callback) => {
+      if (value === '') {
+        callback(new Error('手机号不能为空！'))
+      } else {
+        if (!isMobile(value)) {
+          callback(new Error('手机号格式不正确！'))
+        } else {
+          callback()
+        }
+      }
+    }
 
-      showModelThis: this.showModel,
-      ruleForm: {
-        status: "1", // 通过or驳回
-        is_th: "1", //驳回至
-        return_tag: "1",
-        remark: "",
+    return {
+      formData: {
+        status: '4',
+        remark: '',
+        contactor: '',
+        mobile: '',
+        addr_code: ''
       },
-      rulesThis: this.rules,
+      statusOptions: [
+        { value: '4', label: '通过' }, // -> 待客户退货
+        { value: '2', label: '驳回' } // -> 待采购审核
+      ],
       rules: {
-        status: [
+
+      }
+    }
+  },
+  computed: {
+    displayExpressField() {
+      return this.formData.status === '4'
+    },
+    rules() {
+      return (
+        { status: [
           {
             required: true,
-            message: "请选择审核状态",
-            trigger: "change",
-          },
+            trigger: 'change',
+            message: '请选择审核状态'
+          }
         ],
-        is_th: [
+        remark: [
           {
             required: true,
-            message: "请选择物流费承担方",
-            trigger: "change",
-          },
+            trigger: 'change',
+            message: '请输入备注'
+          }
         ],
-        return_tag: [
+        contactor: [
           {
             required: true,
-            message: "请选择退回位置",
-            trigger: "change",
-          },
+            trigger: 'blur',
+            validator: validatename
+          }
         ],
-        remark: [
-          { required: true, message: "请输入审核备注", trigger: "blur" },
+        mobile: [
           {
-            min: 1,
-            max: 250,
-            message: "长度在 1 到 250 个字符",
-            trigger: "blur",
-          },
+            required: true,
+            trigger: 'blur',
+            validator: validatemobile
+          }
         ],
-      },
-    };
-  },
-  computed: {
-    powers() {
-      const tran =
-        this.$store.getters.btnList.find(
-          (item) => item.menu_route == "sellAfterApplyDetail"
-        ) || {};
-      const { action } = tran ?? {};
-      return action ?? [];
-    },
-    ppowers() {
-      const tran =
-        this.$store.getters.roleProcess.find((i) => i.process_type === "SHD") || {};
-      const { action } = tran ?? {};
-      return action ?? [];
-    },
+        addr_code: [
+          {
+            type: 'array',
+            required: true,
+            trigger: 'change',
+            message: '请选择省市区'
+          }
+        ] }
+      )
+    }
   },
   watch: {
-    newTime: function (val) {
-      if (val) {
-        this.initForm();
+    'formData.status'(newVal) {
+      const newData = {
+        required: newVal === '2',
+        trigger: 'change',
+        message: '请选择审核状态'
       }
-    },
+
+      console.log(this.rules)
+    }
   },
   mounted() {
-    this.initForm();
   },
   methods: {
-    async initForm() {
-      this.loading = true;
-      this.rulesThis = this.rules;
-      await this.resetForm();
-      this.statusChange();
-      this.loading = false;
-    },
-
-    statusChange() {
-      this.rulesThis.is_th[0].required =
-        this.ruleForm.status + '' === "1" && this.is_receive + '' === "1";
-      this.rulesThis.remark[0].required = this.ruleForm.status + '' !== "1";
-    },
-    async resetForm() {
-      // 重置
-      await this.$nextTick(() => {
-        if (this.$refs.ruleForm) {
-          this.$refs.ruleForm.resetFields();
-          this.$refs.ruleForm.clearValidate();
-          const {
-            returnCode,
-            is_receive,
-            status,
-            return_tag,
-            is_th,
-            remark,
-          } = this.sitem;
-          this.status = status || "";
-          this.is_receive = is_receive || "1";
-          this.ruleForm = {
-            status: "1", // 通过or驳回
-            is_th: is_th || "1", //驳回至
-            return_tag: return_tag || "1",
-            remark: remark || "",
-            returnCode: returnCode || "",
-          };
-        }
-      });
-    },
-    async submitForm() {
-      await this.$refs.ruleForm.validate(async (valid) => {
-        if (valid) {
-          if (this.loading) {
-            return;
-          }
-          this.loading = true;
-          let model = JSON.parse(JSON.stringify(this.ruleForm));
-          model.status = model.status + '' === "1" ? "3" : "6";
-          model.is_th = this.is_receive + '' === "0" ? "0" : model.is_th;
-          model.return_tag = this.is_receive + '' === "0" ? "0" : model.return_tag;
-          model.is_post = "0";
-          let res = await asyncRequest.status(model);
-          this.loading = false;
-          if (res && res.code === 0) {
-            this.$notify.success({
-              title: "提交成功！",
-              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;
-        }
-      });
-    },
-  },
-};
+    addr_selectChange(e) {
+      this.formData.addr_code = e || []
+      this.$refs.formRef.validateField('addr_code')
+    }
+  }
+}
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.supplier-form{
+  ::v-deep(.el-form-item){
+    width: 400px;
+  }
+}
+</style>

src/views/sellOut/sellAfterApply/detail.vue

@@ -78,6 +78,7 @@
                 :spucode="sitem.good_code"
               />
             </el-collapse-item>
+
             <el-collapse-item
               title="业务审核"
               name="3"
@@ -91,6 +92,10 @@
                 @searchChange="examForm"
               />
             </el-collapse-item>
+
+            <el-collapse-item title="供应商审核" name="4">
+              <supplier-exam />
+            </el-collapse-item>
             
             <el-collapse-item
               title="采购审核"
@@ -275,7 +280,8 @@ export default {
     async examForm(e) {
       console.log(e);
       if (!this.loading) {
-        let type = e.state + '' === "1" ? "2" : "6";
+        //通过为9「待供应商审核」，不通过为6「业务已驳回」
+        let type = e.state + '' === "1" ? "9" : "6";
         let message = e.state + '' === "1" ? "提交业务审核" : "提交业务审核";
         await this.statusConfirm(type, message, e.remark);
       }

src/views/sellOut/sellAfterApply/index.vue

@@ -255,24 +255,44 @@ export default {
       sitem: null,
       // 收到货状态
       status1Options: [
+        // { id: "1", label: "待业务审核" },
+        // { id: "2", label: "待采购审核" },
+        // { id: "3", label: "待设置仓库" },
+        // { id: "4", label: "待客户退货" },
+        // { id: "5", label: "售后已完成" },
+        // { id: "6", label: "业务已驳回" },
+        // { id: "7", label: "采购已驳回" },
+        // { id: "8", label: "申请已取消" },
         { id: "1", label: "待业务审核" },
         { id: "2", label: "待采购审核" },
-        { id: "3", label: "待设置仓库" },
+        { id: "3", label: "待设置仓库" }, // 废弃
         { id: "4", label: "待客户退货" },
         { id: "5", label: "售后已完成" },
         { id: "6", label: "业务已驳回" },
-        { id: "7", label: "采购已驳回" },
+        { id: "7", label: "采购已驳回" }, // 废弃
         { id: "8", label: "申请已取消" },
+        { id: "9", label: "供应商审核" },
+        { id: "10", label: "业务公司修改待供应商确认" }
       ],
        // 未收到货状态
       status2Options: [
+        // { id: "1", label: "待业务审核" },
+        // { id: "2", label: "待采购审核" },
+        // { id: "3", label: "待同意退货" },
+        // { id: "5", label: "售后已完成" },
+        // { id: "6", label: "业务已驳回" },
+        // { id: "7", label: "采购已驳回" },
+        // { id: "8", label: "申请已取消" },
         { id: "1", label: "待业务审核" },
         { id: "2", label: "待采购审核" },
-        { id: "3", label: "待同意退货" },
+        { id: "3", label: "待设置仓库" }, // 废弃
+        { id: "4", label: "待客户退货" },
         { id: "5", label: "售后已完成" },
         { id: "6", label: "业务已驳回" },
-        { id: "7", label: "采购已驳回" },
+        { id: "7", label: "采购已驳回" }, // 废弃
         { id: "8", label: "申请已取消" },
+        { id: "9", label: "供应商审核" },
+        { id: "10", label: "业务公司修改待供应商确认" }
       ],
       loading: false,
       showModel: false,

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

@@ -29,20 +29,7 @@
           </el-select>
         </el-form-item>
       </el-col>
-      <el-col :span="6">
-        <el-form-item label="所属平台" prop="platform_code" class="clear">
-          <search-terrace
-            :value="ruleForm.platform_code"
-            :disabled="type === 'view' || ruleForm.is_project === '1'"
-            :size="'mini'"
-            :is_show="'1'"
-            :isDetail="type === 'view'"
-            :names="platform_code_name"
-            :placeholder="'所属平台'"
-            @searchChange="platform_code_codesearchChange"
-          />
-        </el-form-item>
-      </el-col>
+      
       <el-col :span="6">
         <el-form-item
           label="竞价截止时间"
@@ -61,6 +48,21 @@
           </el-date-picker>
         </el-form-item>
       </el-col>
+
+      <el-col :span="12">
+        <el-form-item label="所属平台" prop="platform_code" class="clear">
+          <search-terrace
+            :value="ruleForm.platform_code"
+            :disabled="type === 'view' || ruleForm.is_project === '1'"
+            :size="'mini'"
+            :is_show="'1'"
+            :isDetail="type === 'view'"
+            :names="platform_code_name"
+            :placeholder="'所属平台'"
+            @searchChange="platform_code_codesearchChange"
+          />
+        </el-form-item>
+      </el-col>
       <el-col :span="12">
         <el-form-item label="销售方" prop="companyNo" class="clear">
           <el-input :value="getCompanyWithCode(ruleForm.companyNo).name" disabled />
@@ -425,8 +427,10 @@ export default {
       },
     };
   },
-  mounted() {
-    this.initForm();
+  async mounted() {
+    await this.initForm();
+    await this.onCompanyChange()
+    
   },
   watch: {
     id: function (val) {
@@ -443,7 +447,6 @@ export default {
   methods: {
     onCompanyChange(){
       this.ruleForm.companyNo = this.currentCompany
-      console.log(this.currentCompany)
     },
     async initForm() {
       this.loading = true;

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

@@ -74,15 +74,14 @@
       </el-col>
       <el-col :span="12">
         <el-form-item label="销售方" prop="companyNo">
-<!--          <search-work-company-->
-<!--            :value="ruleForm.companyNo"-->
-<!--            :placeholder="'销售方公司'"-->
-<!--            :disabled="type === 'view' || type === 'edit'"-->
-<!--            :size="'mini'"-->
-<!--            :isDetail="type === 'view' || type === 'edit'"-->
-<!--            @searchChange="company_idsearchChange"-->
-<!--          />-->
-          <el-input :value="companyName" disabled />
+       <search-work-company
+         :value="ruleForm.companyNo"
+         :placeholder="'销售方公司'"
+         :disabled="type === 'view' || type === 'edit'"
+         :size="'mini'"
+         :isDetail="type === 'view' || type === 'edit'"
+         @searchChange="company_idsearchChange" 
+          />
         </el-form-item>
       </el-col>
       <el-col :span="12">
@@ -863,8 +862,9 @@ export default {
             p_good_img,
             p_arrtime,
             specinfo,
-            enclosure_file,
+            enclosure_file
           } = JSON.parse(JSON.stringify(this.sitem));
+
           this.unit_name = unit_name;
           this.brand_name = brand;
           this.spec_tableData =
@@ -926,6 +926,7 @@ export default {
             unit: unit ? [unit] : [],
             enclosure_file: enclosure_file || "",
           };
+          console.log(this.ruleForm)
           this.pay_name = pay_id + "" == "0" ? "不选择" : pay_name;
           if (this.ruleForm.projectNo) {
             await this.projectChange([{ projectNo: this.ruleForm.projectNo }]);

src/views/sellOut/zixunOrder/detail.vue

@@ -4,7 +4,7 @@
       class="zixunOrderDetail-main"
       v-if=" powers.some((i) => i == '007')"
     >
-      <show-data-table
+    <show-data-table
         style="padding: 10px 0 5px 0"
         :newTime="newTime"
         border
@@ -259,7 +259,7 @@ export default {
     // 点击业务审核的保存按钮
 
     async examForm(e) {
-      console.log(e);
+      return;
       if (!this.loading) {
         let model = {
           activity_code: this.queryId,