feat:项目经理

src/components/globalComponents/project-manager/main.vue

@@ -25,13 +25,7 @@
         :disabled="item.status + '' !== '1'"
       />
     </el-select>
-    <el-button
-      :size="size || 'medium'"
-      class="p-btn"
-      @click="changeMe"
-      :disabled="loading"
-      >选当前账号</el-button
-    >
+    <el-button :size="size || 'medium'" class="p-btn" @click="changeMe" :disabled="loading">选当前账号</el-button>
   </div>
 </template>
 
@@ -47,7 +41,7 @@ export default {
     ...mapGetters(["currentCompany"]),
     infoPowers() {
       return this.$store.getters.userInfo;
-    },
+    }
   },
   props: ["size", "value", "isDetail", "disabled", "names"],
   /**
@@ -73,24 +67,22 @@ export default {
       formValue: {
         page: 1,
         size: 99999,
-        status: "",
-      },
+        status: ""
+      }
     };
   },
   watch: {
-    names: function (val, old) {
-      // console.log(val, old, this.isDetail, "1");
+    names: function(val, old) {
       this.searchName = val;
       if (this.isDetail && this.searchName) {
         this.remoteMethod(this.searchName);
       }
     },
-    isDetail: function (val, old) {
-      // console.log(val, old, this.isDetail, "2");
+    isDetail: function(val, old) {
       if (val && this.searchName) {
         this.remoteMethod(this.searchName);
       }
-    },
+    }
   },
   mounted() {
     this.options = [];
@@ -102,13 +94,15 @@ export default {
       this.loading = true;
       const id = this.infoPowers.id ?? "";
       const userName = this.infoPowers.nickname ?? "";
+
       if (userName === "") {
         this.loading = false;
         this.$message.warning("当前账号异常，请重新登录!");
         return;
       }
+
       await this.getList(userName);
-      let index = this.options.findIndex((s) => s.id === id);
+      let index = this.options.findIndex(s => s.id === id);
       if (index === -1) {
         this.loading = false;
         this.$message.warning("当前业务公司下，未找到当前账号!");
@@ -116,18 +110,20 @@ export default {
       }
       const model = {
         id: this.options[index].id + "",
-        label: this.options[index].nickname,
+        label: this.options[index].nickname
       };
+
+      // console.log(model);
       this.$emit("searchChange", model);
       this.loading = false;
     },
     async selectChange(e) {
       if (e && e.length > 0) {
-        const index = this.options.findIndex((v) => v.id + "" === e[0]);
+        const index = this.options.findIndex(v => v.id + "" === e[0]);
         if (index !== -1) {
           const model = {
             id: this.options[index].id + "",
-            label: this.options[index].nickname,
+            label: this.options[index].nickname
           };
           this.$emit("searchChange", model);
         } else {
@@ -148,11 +144,13 @@ export default {
       if (this.selectLoading) return;
       this.selectLoading = true;
       this.options = [];
+
       const { code, data, message } = await asyncRequest.list({
         ...this.formValue,
         nickname: query,
-        companyNo: this.currentCompany,
+        companyNo: this.currentCompany
       });
+
       if (code === 0) {
         const { list } = data;
         this.options = list;
@@ -162,12 +160,12 @@ export default {
         this.$message.warning(message);
       }
       this.selectLoading = false;
-    },
-  },
+    }
+  }
 };
 </script>
 
-<style>
+<style lang="scss" scoped>
 .project-manager {
   width: 100%;
   .p-btn {

src/views/netOrderEntry/netOrderEnter/addEdit.vue

@@ -33,7 +33,9 @@
             <el-row>
               <el-col :span="12">
                 <el-form-item label="销售方公司:" label-width="100px" prop="companyNo">
-                  <p style="font-size:14px;color:#606266;font-weight:700">{{ getCompanyWithCode(ruleForm.companyNo).name }}</p>
+                  <p
+                    style="font-size:14px;color:#606266;font-weight:700"
+                  >{{ getCompanyWithCode(ruleForm.companyNo).name }}</p>
                   <!-- <search-work-company
                     disabled
                     :value="ruleForm.companyNo"
@@ -41,7 +43,7 @@
                     :size="'mini'"
                     :placeholder="'销售方公司'"
                     @searchChange="handleCompanyChange"
-                  /> -->
+                  />-->
                 </el-form-item>
               </el-col>
 
@@ -71,7 +73,7 @@
                     @searchChange="handleHandoverName"
                   />
                 </el-form-item>
-              </el-col> -->
+              </el-col>-->
               <el-col :span="12">
                 <el-form-item label="商品分类" prop="cat_id">
                   <company-sort
@@ -125,6 +127,18 @@
                   />
                 </el-form-item>
               </el-col>
+
+              <el-col :span="24">
+                <el-form-item label="项目经理" prop="manager">
+                  <project-manager
+                    size="mini"
+                    :value="ruleForm.manager"
+                    placeholder="项目经理"
+                    @searchChange="managerChange"
+                    style="width:100%"
+                  />
+                </el-form-item>
+              </el-col>
             </el-row>
 
             <el-divider>
@@ -227,7 +241,7 @@
                 <el-form-item label="销售总额" prop="sale_total">
                   <!-- <el-input v-model="ruleForm.sale_total" placeholder="销售总额">
                     <template #append>元</template>
-                  </el-input> -->
+                  </el-input>-->
                   <el-input-number
                     v-model="ruleForm.sale_total"
                     :disabled="id !== '003' || disabledField"
@@ -270,7 +284,7 @@
                     :max="100"
                     :step="0.01"
                     @change="number_change($event, 2)"
-                  /> -->
+                  />-->
                   <digital-input
                     :values="ruleForm.cgd_tax"
                     :placeholder="'采购毛利率'"
@@ -349,324 +363,315 @@
           </el-form>
         </el-col>
         <el-col :span="24" style="text-align: right">
-          <el-button
-            v-if="id !== '007'"
-            type="primary"
-            @click="submitForm"
-          >保 存</el-button>
-          <el-button @click="showModelThis = false">
-            {{ id == "007" ? "关 闭" : "取 消" }}
-          </el-button>
+          <el-button v-if="id !== '007'" type="primary" @click="submitForm">保 存</el-button>
+          <el-button @click="showModelThis = false">{{ id == "007" ? "关 闭" : "取 消" }}</el-button>
         </el-col>
       </el-row>
     </el-card>
   </el-dialog>
 </template>
 <script>
-import asyncRequest from '@/apis/service/netOrderEntry/netOrderEnter'
-import companyHelper from '@/mixins/companyHelper'
-import { accMul, accDiv, accSub, isPhone, isMobile } from '@/utils/validate'
-import resToken from '@/mixins/resToken'
+import asyncRequest from "@/apis/service/netOrderEntry/netOrderEnter";
+import companyHelper from "@/mixins/companyHelper";
+import { accMul, accDiv, accSub, isPhone, isMobile } from "@/utils/validate";
+import resToken from "@/mixins/resToken";
 
 const defaultData = {
   addr_code: [],
-  cgd_total: '',
-  cgdPrice: '',
+  cgd_total: "",
+  cgdPrice: "",
+  manager: [],
   // buyerid: "",
   // buyer_name: "",
-  platform_id: '',
-  cgd_tax: '',
-  workCode: '',
-  poCode: '',
-  khNo: '',
-  companyNo: '',
-  contactor: '',
-  mobile: '',
-  addr: '',
-  sendtime: '',
-  supplierNo: '',
-  cat_id: '',
-  goodName: '',
-  goodNum: '',
-  goodPrice: '',
-  sale_total: '',
-  goodUnit: '',
-  tax: ''
-}
+  platform_id: "",
+  cgd_tax: "",
+  workCode: "",
+  poCode: "",
+  khNo: "",
+  companyNo: "",
+  contactor: "",
+  mobile: "",
+  addr: "",
+  sendtime: "",
+  supplierNo: "",
+  cat_id: "",
+  goodName: "",
+  goodNum: "",
+  goodPrice: "",
+  sale_total: "",
+  goodUnit: "",
+  tax: ""
+};
 
 export default {
-  name: 'Terrace',
+  name: "Terrace",
   mixins: [resToken, companyHelper],
-  props: ['showModel', 'id', 'sitem'],
+  props: ["showModel", "id", "sitem"],
   data() {
     const validatemobile = (rule, value, callback) => {
-      if (value !== '') {
+      if (value !== "") {
         if (isPhone(value) || isMobile(value)) {
-          callback()
+          callback();
         } else {
-          callback(new Error('联系电话格式不正确！'))
+          callback(new Error("联系电话格式不正确！"));
         }
       } else {
-        callback(new Error('请输入联系电话！'))
+        callback(new Error("请输入联系电话！"));
       }
-    }
+    };
 
     return {
       loading: false,
       detailLoading: false,
-      title: '添加销售订单信息',
-      khName: '',
+      title: "添加销售订单信息",
+      khName: "",
       accounts: [],
-      cat_id_name: '',
+      cat_id_name: "",
       showModelThis: this.showModel,
       pickerOptions: {
-        disabledDate: (time) => time.getTime() > new Date()
+        disabledDate: time => time.getTime() > new Date()
       },
       names: [],
-      unit_name: '',
-      companyName: '',
+      unit_name: "",
+      companyName: "",
       ruleForm: { ...defaultData },
       rulesThis: this.rules,
       rules: {
         goodUnit: [
           {
             required: true,
-            message: '请选择单位',
-            trigger: 'blur'
+            message: "请选择单位",
+            trigger: "blur"
+          }
+        ],
+        manager: [
+          {
+            type: "array",
+            required: true,
+            message: "请选择项目经理",
+            trigger: "blur"
           }
         ],
-        // addr_code: [
-        //   {
-        //     type: "array",
-        //     required: true,
-        //     message: "请选择收货省市区",
-        //     trigger: "blur",
-        //   },
-        // ],
         platform_id: [
           {
             required: true,
-            message: '请输入所属平台',
-            trigger: 'blur'
+            message: "请输入所属平台",
+            trigger: "blur"
           }
         ],
-
         cgd_tax: [
           {
             required: true,
-            message: '请输入采购毛利率',
-            trigger: 'blur'
+            message: "请输入采购毛利率",
+            trigger: "blur"
           }
         ],
         cat_id: [
           {
             required: true,
-            message: '请选择商品分类',
-            trigger: 'change'
+            message: "请选择商品分类",
+            trigger: "change"
           }
         ],
         supplierNo: [
           {
-            type: 'array',
+            type: "array",
             required: true,
-            message: '请选择供应商公司',
-            trigger: 'change'
+            message: "请选择供应商公司",
+            trigger: "change"
           }
         ],
         qrdType: [
           {
             required: true,
-            message: '请输入订单来源',
-            trigger: 'blur'
+            message: "请输入订单来源",
+            trigger: "blur"
           }
         ],
         sale_total: [
           {
             required: true,
-            message: '请输入销售总额',
-            trigger: 'blur'
+            message: "请输入销售总额",
+            trigger: "blur"
           }
         ],
-        // workCode: [
-        //   {
-        //     required: true,
-        //     message: '请输入单据号',
-        //     trigger: 'blur'
-        //   }
-        // ],
         poCode: [
           {
             required: true,
-            message: '请输入PO编号',
-            trigger: 'blur'
+            message: "请输入PO编号",
+            trigger: "blur"
           }
         ],
         khNo: [
           {
-            type: 'array',
+            type: "array",
             required: true,
-            message: '请选择购买方公司',
-            trigger: 'change'
+            message: "请选择购买方公司",
+            trigger: "change"
           }
         ],
         tax: [
           {
             required: true,
-            message: '请选择税率',
-            trigger: 'change'
+            message: "请选择税率",
+            trigger: "change"
           }
         ],
         companyNo: [
           {
             required: true,
-            message: '请选择销售方公司',
-            trigger: 'change'
+            message: "请选择销售方公司",
+            trigger: "change"
           }
         ],
         contactor: [
           {
             required: true,
-            message: '请输入收货人',
-            trigger: 'blur'
+            message: "请输入收货人",
+            trigger: "blur"
           }
         ],
         mobile: [
           {
             required: true,
             validator: validatemobile,
-            trigger: 'blur'
+            trigger: "blur"
           }
         ],
         addr: [
           {
             required: true,
-            message: '请输入联系地址',
-            trigger: 'blur'
+            message: "请输入联系地址",
+            trigger: "blur"
           }
         ],
 
         sendtime: [
           {
             required: true,
-            message: '请输入发货时间',
-            trigger: 'change'
+            message: "请输入发货时间",
+            trigger: "change"
           }
         ],
 
         goodName: [
           {
             required: true,
-            message: '请输入商品名称',
-            trigger: 'blur'
+            message: "请输入商品名称",
+            trigger: "blur"
           }
         ],
         goodPrice: [
           {
             required: true,
-            message: '请输入销售单价',
-            trigger: 'blur'
+            message: "请输入销售单价",
+            trigger: "blur"
           }
         ],
         cgdPrice: [
           {
             required: true,
-            message: '请选择采购单价',
-            trigger: 'blur'
+            message: "请选择采购单价",
+            trigger: "blur"
           }
         ],
         goodNum: [
           {
             required: true,
-            message: '请输入数量',
-            trigger: 'blur'
+            message: "请输入数量",
+            trigger: "blur"
           }
         ],
         cgd_total: [
           {
             required: true,
-            message: '请输入采购总额',
-            trigger: 'blur'
+            message: "请输入采购总额",
+            trigger: "blur"
           }
         ]
       }
-    }
+    };
   },
   computed: {
     disabledField() {
-      const { goodNum } = this.ruleForm
-      return !goodNum || Number(goodNum) <= 0
+      const { goodNum } = this.ruleForm;
+      return !goodNum || Number(goodNum) <= 0;
     },
     totalWatchSource() {
-      const { goodNum, goodPrice } = this.ruleForm
-      return { goodNum, goodPrice }
+      const { goodNum, goodPrice } = this.ruleForm;
+      return { goodNum, goodPrice };
     },
     cgdTotalWatchSource() {
-      const { goodNum, cgdPrice } = this.ruleForm
-      return { goodNum, cgdPrice }
+      const { goodNum, cgdPrice } = this.ruleForm;
+      return { goodNum, cgdPrice };
     }
   },
   watch: {
     showModel: function(val) {
-      this.showModelThis = val
+      this.showModelThis = val;
       if (val) {
-        this.initForm()
+        this.initForm();
       }
     },
     showModelThis(val) {
       if (!val) {
-        this.$emit('cancel')
+        this.$emit("cancel");
       }
     },
     totalWatchSource: {
       handler({ goodPrice, goodNum }) {
         if (goodPrice === 0 || goodNum === 0) {
-          this.ruleForm.sale_total = 0
-          return
+          this.ruleForm.sale_total = 0;
+          return;
         }
-
-        this.ruleForm.sale_total = accMul(goodPrice, goodNum)
+        this.ruleForm.sale_total = accMul(goodPrice, goodNum);
       },
       deep: true
     },
     cgdTotalWatchSource: {
       handler({ cgdPrice, goodNum }) {
         if (cgdPrice === 0 || goodNum === 0) {
-          this.ruleForm.cgd_total = 0
-          return
+          this.ruleForm.cgd_total = 0;
+          return;
         }
 
-        this.ruleForm.cgd_total = accMul(cgdPrice, goodNum)
+        this.ruleForm.cgd_total = accMul(cgdPrice, goodNum);
       },
       deep: true
     }
   },
   methods: {
+    managerChange(e) {
+      const { id } = e;
+      this.ruleForm.manager = id ? [id] : [];
+      this.$refs.ruleForm.validateField("manager");
+    },
     async handleHandoverName(e) {
-      this.ruleForm.buyerid = e && e.id ? [e.id] : ''
-      this.ruleForm.buyer_name = e && e.label ? e.label : ''
-      this.$refs.ruleForm.validateField('buyerid')
+      this.ruleForm.buyerid = e && e.id ? [e.id] : "";
+      this.ruleForm.buyer_name = e && e.label ? e.label : "";
+      this.$refs.ruleForm.validateField("buyerid");
     },
     async select_area_change(e) {
-      this.ruleForm.addr_code = e
-      this.$refs.ruleForm.validateField('addr_code')
+      this.ruleForm.addr_code = e;
+      this.$refs.ruleForm.validateField("addr_code");
     },
     number_change(e, type) {
-      this.ruleForm.cgd_tax = e
-      const { cgdPrice, goodPrice, cgd_tax } = this.ruleForm
-      let tax = 0
-      let cgd_price = 0
+      this.ruleForm.cgd_tax = e;
+      const { cgdPrice, goodPrice, cgd_tax } = this.ruleForm;
+      let tax = 0;
+      let cgd_price = 0;
 
       if (type === 1) {
         // tax = (1 - cgdPrice / goodPrice)*100
-        tax = accMul(accSub(1, accDiv(cgdPrice, goodPrice)), 100)
-        this.ruleForm.cgd_tax = tax
-        this.$refs.ruleForm.validateField('cgd_tax')
+        tax = accMul(accSub(1, accDiv(cgdPrice, goodPrice)), 100);
+        this.ruleForm.cgd_tax = tax;
+        this.$refs.ruleForm.validateField("cgd_tax");
       }
       if (type === 2) {
         // cgd_price = ((100 - cgd_tax) / 100) * goodPrice;
-        cgd_price = accMul(accDiv(accSub(100, cgd_tax), 100), goodPrice) || 0
-        this.ruleForm.cgdPrice = cgd_price
-        this.$refs.ruleForm.validateField('cgdPrice')
+        cgd_price = accMul(accDiv(accSub(100, cgd_tax), 100), goodPrice) || 0;
+        this.ruleForm.cgdPrice = cgd_price;
+        this.$refs.ruleForm.validateField("cgdPrice");
       }
 
       // if (this.ruleForm.cgdPrice && this.ruleForm.goodPrice) {
@@ -674,88 +679,94 @@ export default {
       // }
     },
     handleClose() {
-      this.showModelThis = false
-      this.companyName = ''
-      this.khName = ''
-      this.supplierName = ''
-      this.ruleForm = { ...defaultData }
+      this.showModelThis = false;
+      this.companyName = "";
+      this.khName = "";
+      this.supplierName = "";
+      this.ruleForm = { ...defaultData };
     },
     async initForm() {
-      this.loading = true
+      this.loading = true;
       // await this.getAccounts();
 
-      if (this.id === '003') {
-        this.title = '添加销售订单信息'
-        this.rulesThis = this.rules
-      } else if (this.id === '005') {
-        this.title = '修改销售订单信息'
-        this.rulesThis = this.rules
+      if (this.id === "003") {
+        this.title = "添加销售订单信息";
+        this.rulesThis = this.rules;
+      } else if (this.id === "005") {
+        this.title = "修改销售订单信息";
+        this.rulesThis = this.rules;
       } else {
-        this.title = '销售订单信息详情'
-        this.rulesThis = {}
+        this.title = "销售订单信息详情";
+        this.rulesThis = {};
       }
-      await this.resetForm()
-      this.loading = false
+      await this.resetForm();
+      this.loading = false;
     },
 
     handleCompanyChange(e) {
-      this.ruleForm.companyNo = e.code || ''
-      this.$refs.ruleForm.validateField('companyNo')
+      this.ruleForm.companyNo = e.code || "";
+      this.$refs.ruleForm.validateField("companyNo");
     },
     handleCustomerChange(e) {
-      this.ruleForm.khNo = e.code ? [e.code] : ''
-      this.$refs.ruleForm.validateField('khNo')
+      this.ruleForm.khNo = e.code ? [e.code] : "";
+      this.$refs.ruleForm.validateField("khNo");
     },
     handleSupplierChange(e) {
-      this.ruleForm.supplierNo = e.code ? [e.code] : ''
-      this.$refs.ruleForm.validateField('supplierNo')
+      this.ruleForm.supplierNo = e.code ? [e.code] : "";
+      this.$refs.ruleForm.validateField("supplierNo");
     },
     handleGoodClassChange(e) {
-      this.ruleForm.cat_id = e
-      this.$refs.ruleForm.validateField('cat_id')
+      this.ruleForm.cat_id = e;
+      this.$refs.ruleForm.validateField("cat_id");
     },
     handleTaxChange(e) {
-      this.ruleForm.tax = e
-      this.$refs.ruleForm.validateField('tax')
+      this.ruleForm.tax = e;
+      this.$refs.ruleForm.validateField("tax");
     },
     unitsearchChange(e) {
-      const { id, code, label } = e
-      this.ruleForm.goodUnit = code ? [code] : []
-      this.$refs.ruleForm.validateField('goodUnit')
+      const { id, code, label } = e;
+      this.ruleForm.goodUnit = code ? [code] : [];
+      this.$refs.ruleForm.validateField("goodUnit");
     },
     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();
         }
-      })
+      });
 
-      if (this.id === '003') {
-        this.ruleForm.companyNo = this.currentCompany
-        return
+      if (this.id === "003") {
+        this.ruleForm.companyNo = this.currentCompany;
+        return;
       }
 
-      if (this.id !== '003') this.getDetail()
+      if (this.id !== "003") this.getDetail();
     },
     number_change_total(current, prop) {
-      const isCgdTotal = prop === 'cgd_total'
-      const { goodNum } = this.ruleForm
-      this.ruleForm[isCgdTotal ? 'cgdPrice' : 'goodPrice'] = accDiv(current, goodNum)
-      this.ruleForm[prop] = current
-
-      let tax = 0
-      tax = accMul(accSub(1, accDiv(this.ruleForm.cgd_total, this.ruleForm.sale_total)), 100)
-      this.ruleForm.cgd_tax = tax
+      const isCgdTotal = prop === "cgd_total";
+      const { goodNum } = this.ruleForm;
+      this.ruleForm[isCgdTotal ? "cgdPrice" : "goodPrice"] = accDiv(
+        current,
+        goodNum
+      );
+      this.ruleForm[prop] = current;
+
+      let tax = 0;
+      tax = accMul(
+        accSub(1, accDiv(this.ruleForm.cgd_total, this.ruleForm.sale_total)),
+        100
+      );
+      this.ruleForm.cgd_tax = tax;
       // if (this.ruleForm.cgd_total && this.ruleForm.sale_total) {
       //   this.ruleForm['cgd_tax'] = accMul(accDiv(this.ruleForm.cgd_total, this.ruleForm.sale_total), 100) || 0
       // }
     },
     async getDetail() {
-      this.detailLoading = true
-      const { orderCode } = this.sitem
-      const { data } = await asyncRequest.detail({ orderCode })
+      this.detailLoading = true;
+      const { orderCode } = this.sitem;
+      const { data } = await asyncRequest.detail({ orderCode });
 
       const {
         cat_id,
@@ -769,32 +780,32 @@ export default {
         addr_code,
         unitName,
         ...rest
-      } = data
+      } = data;
 
       this.ruleForm = {
         ...rest,
         buyerid: buyerid ? [buyerid] : [],
-        addr_code: addr_code ? addr_code.split(',') : [],
+        addr_code: addr_code ? addr_code.split(",") : [],
         cat_id: cat_id ? [cat_id[cat_id.length - 1]] : [],
         supplierNo: supplierNo ? [supplierNo] : [],
         khNo: khNo ? [khNo] : [],
-        tax: tax ? tax + '%' : '',
-        goodUnit: goodUnit ? [goodUnit] : ''
-      }
+        tax: tax ? tax + "%" : "",
+        goodUnit: goodUnit ? [goodUnit] : ""
+      };
 
-      this.cat_id_name = cat_id.map(({ name }) => name).join('_')
-      console.log(this.cat_id_name)
-      this.unit_name = unitName
+      this.cat_id_name = cat_id.map(({ name }) => name).join("_");
+      console.log(this.cat_id_name);
+      this.unit_name = unitName;
 
-      this.khName = khName
-      this.supplierName = supplierNanme
-      this.detailLoading = false
+      this.khName = khName;
+      this.supplierName = supplierNanme;
+      this.detailLoading = false;
     },
     platform_codesearchChange(e) {
-      const { id, label, pay_name } = e
-      this.ruleForm.platform_id = id || ''
-      this.pay_name = pay_name || ''
-      this.$refs.ruleForm.validateField('platform_id')
+      const { id, label, pay_name } = e;
+      this.ruleForm.platform_id = id || "";
+      this.pay_name = pay_name || "";
+      this.$refs.ruleForm.validateField("platform_id");
     },
     // async getAccounts() {
     //   const res = await asyncRequest.accountall(this.dataForm);
@@ -807,60 +818,64 @@ export default {
     //   }
     // },
     async goods_class_change(e) {
-      const { id } = e
-      this.ruleForm.cat_id = id ? [id] : []
-      this.$refs.ruleForm.validateField('cat_id')
+      const { id } = e;
+      this.ruleForm.cat_id = id ? [id] : [];
+      this.$refs.ruleForm.validateField("cat_id");
     },
     async submitForm() {
-      await this.$refs.ruleForm.validate(async(valid) => {
+      await this.$refs.ruleForm.validate(async valid => {
         if (valid) {
           if (this.loading) {
-            return
+            return;
           }
 
-          this.loading = true
-          const model = JSON.parse(JSON.stringify(this.ruleForm))
-          model.supplierNo = model.supplierNo[0]
-          model.khNo = model.khNo[0]
-          model.buyerid = Array.isArray(model.buyerid) ? model.buyerid[0] : model.buyerid
-          model.cat_id = model.cat_id ? model.cat_id[model.cat_id.length - 1] : ''
-          model.addr_code = model.addr_code.join(',')
-          model.tax = model.tax.split('%')[0]
-          model.pay_name = this.pay_name
+          this.loading = true;
+          const model = JSON.parse(JSON.stringify(this.ruleForm));
+          model.supplierNo = model.supplierNo[0];
+          model.khNo = model.khNo[0];
+          model.buyerid = Array.isArray(model.buyerid)
+            ? model.buyerid[0]
+            : model.buyerid;
+          model.cat_id = model.cat_id
+            ? model.cat_id[model.cat_id.length - 1]
+            : "";
+          model.addr_code = model.addr_code.join(",");
+          model.tax = model.tax.split("%")[0];
+          model.pay_name = this.pay_name;
           model.goodUnit = Array.isArray(model.goodUnit)
             ? model.goodUnit[0]
-            : model.goodUnit
+            : model.goodUnit;
 
-          let res = {}
-          if (this.id === '003') {
-            delete model['id']
-            res = await asyncRequest.add(model)
+          let res = {};
+          if (this.id === "003") {
+            delete model["id"];
+            res = await asyncRequest.add(model);
           } else {
-            res = await asyncRequest.update(model)
+            res = await asyncRequest.update(model);
           }
-          this.loading = false
+          this.loading = false;
           if (res && res.code === 0) {
-            const title = this.id === '003' ? '添加成功!' : '修改成功!'
+            const title = this.id === "003" ? "添加成功!" : "修改成功!";
             this.$notify.success({
               title,
-              message: ''
-            })
-            this.showModelThis = false
+              message: ""
+            });
+            this.showModelThis = false;
             // 刷新
-            this.$emit('refresh')
+            this.$emit("refresh");
           } else if (res && res.code >= 100 && res.code <= 104) {
-            await this.logout()
+            await this.logout();
           } else {
-            this.$message.warning(res.message)
+            this.$message.warning(res.message);
           }
         } else {
-          console.log('error submit!!')
-          return false
+          console.log("error submit!!");
+          return false;
         }
-      })
+      });
     }
   }
-}
+};
 </script>
 
 <style lang="scss" scoped>

src/views/netOrderEntry/prestoreRecordingOrders/addEdit.vue

@@ -33,8 +33,10 @@
             <el-row>
               <el-col :span="12">
                 <el-form-item label="销售方公司:" label-width="100px" prop="companyNo">
-                  <p style="font-size:14px;color:#606266;font-weight:700">{{ getCompanyWithCode(ruleForm.companyNo).name }}</p>
- </el-form-item>
+                  <p
+                    style="font-size:14px;color:#606266;font-weight:700"
+                  >{{ getCompanyWithCode(ruleForm.companyNo).name }}</p>
+                </el-form-item>
               </el-col>
 
               <el-col :span="12">
@@ -63,7 +65,7 @@
                     @searchChange="handleHandoverName"
                   />
                 </el-form-item>
-              </el-col> -->
+              </el-col>-->
               <el-col :span="12">
                 <el-form-item label="商品分类" prop="cat_id">
                   <company-sort
@@ -85,7 +87,7 @@
                     :value="ruleForm.platform_id"
                     :disabled="id !== '003'"
                     :size="'mini'"
-                    :is-detail="falsse"
+                    :is-detail="false"
                     :is_show="'0'"
                     :placeholder="'所属平台'"
                     @searchChange="platform_codesearchChange"
@@ -148,13 +150,13 @@
               <el-col :span="8">
                 <el-form-item label="发货时间" prop="sendtime">
                   <el-date-picker
+                    :picker-options="pickerOptions"
                     v-model="ruleForm.sendtime"
                     value-format="yyyy-MM-dd"
                     :disabled="id === '007'"
-                    type="datetime"
                     placeholder="发货时间"
                     style="width: 100%"
-                    :picker-options="pickerOptions"
+                    type="datetime"
                   />
                 </el-form-item>
               </el-col>
@@ -217,9 +219,6 @@
               </el-col>
               <el-col :span="6">
                 <el-form-item label="销售总额" prop="sale_total">
-                  <!-- <el-input v-model="ruleForm.sale_total" placeholder="销售总额">
-                    <template #append>元</template>
-                  </el-input> -->
                   <el-input-number
                     v-model="ruleForm.sale_total"
                     :disabled="id !== '003' || disabledField"
@@ -262,7 +261,7 @@
                     :max="100"
                     :step="0.01"
                     @change="number_change($event, 2)"
-                  /> -->
+                  />-->
                   <digital-input
                     :values="ruleForm.cgd_tax"
                     :placeholder="'采购毛利率'"
@@ -341,90 +340,84 @@
           </el-form>
         </el-col>
         <el-col :span="24" style="text-align: right">
-          <el-button
-            v-if="id !== '007'"
-            type="primary"
-            @click="submitForm"
-          >保 存</el-button>
-          <el-button @click="showModelThis = false">
-            {{ id == "007" ? "关 闭" : "取 消" }}
-          </el-button>
+          <el-button v-if="id !== '007'" type="primary" @click="submitForm">保 存</el-button>
+          <el-button @click="showModelThis = false">{{ id == "007" ? "关 闭" : "取 消" }}</el-button>
         </el-col>
       </el-row>
     </el-card>
   </el-dialog>
 </template>
 <script>
-import asyncRequest from '@/apis/service/netOrderEntry/netOrderEnter'
-import companyHelper from '@/mixins/companyHelper'
-import { accMul, accDiv, accSub, isPhone, isMobile } from '@/utils/validate'
-import resToken from '@/mixins/resToken'
+import asyncRequest from "@/apis/service/netOrderEntry/netOrderEnter";
+import companyHelper from "@/mixins/companyHelper";
+import { accMul, accDiv, accSub, isPhone, isMobile } from "@/utils/validate";
+import resToken from "@/mixins/resToken";
 
 const defaultData = {
   addr_code: [],
-  cgd_total: '',
-  cgdPrice: '',
+  cgd_total: "",
+  cgdPrice: "",
   // buyerid: "",
   // buyer_name: "",
-  platform_id: '',
-  cgd_tax: '',
-  workCode: '',
-  poCode: '',
-  khNo: '',
-  companyNo: '',
-  contactor: '',
-  mobile: '',
-  addr: '',
-  sendtime: '',
-  supplierNo: '',
-  cat_id: '',
-  goodName: '',
-  goodNum: '',
-  goodPrice: '',
-  sale_total: '',
-  goodUnit: '',
-  tax: ''
-}
+  platform_id: "",
+  cgd_tax: "",
+  workCode: "",
+  poCode: "",
+  khNo: "",
+  companyNo: "",
+  contactor: "",
+  mobile: "",
+  addr: "",
+  sendtime: "",
+  supplierNo: "",
+  cat_id: "",
+  goodName: "",
+  goodNum: "",
+  goodPrice: "",
+  sale_total: "",
+  goodUnit: "",
+  tax: ""
+};
 
 export default {
-  name: 'Terrace',
+  name: "Terrace",
   mixins: [resToken, companyHelper],
-  props: ['showModel', 'id', 'sitem'],
+  props: ["showModel", "id", "sitem"],
   data() {
     const validatemobile = (rule, value, callback) => {
-      if (value !== '') {
+      if (value !== "") {
         if (isPhone(value) || isMobile(value)) {
-          callback()
+          callback();
         } else {
-          callback(new Error('联系电话格式不正确！'))
+          callback(new Error("联系电话格式不正确！"));
         }
       } else {
-        callback(new Error('请输入联系电话！'))
+        callback(new Error("请输入联系电话！"));
       }
-    }
+    };
 
     return {
       loading: false,
       detailLoading: false,
-      title: '添加销售订单信息',
-      khName: '',
+      title: "添加销售订单信息",
+      khName: "",
       accounts: [],
-      cat_id_name: '',
+      cat_id_name: "",
       showModelThis: this.showModel,
       pickerOptions: {
-        disabledDate: (time) => time.getTime() > new Date()
+        disabledDate: time => time.getTime() > new Date()
       },
       names: [],
-      unit_name: '',
-      companyName: '',
+      unit_name: "",
+      companyName: "",
       ruleForm: { ...defaultData },
       rulesThis: this.rules,
       rules: {
         goodUnit: [
           {
             required: true,
-            message: '请选择单位',
-            trigger: 'blur'
+            message: "请选择单位",
+            trigger: "blur"
           }
         ],
         // addr_code: [
@@ -438,45 +431,45 @@ export default {
         platform_id: [
           {
             required: true,
-            message: '请输入所属平台',
-            trigger: 'blur'
+            message: "请输入所属平台",
+            trigger: "blur"
           }
         ],
 
         cgd_tax: [
           {
             required: true,
-            message: '请输入采购毛利率',
-            trigger: 'blur'
+            message: "请输入采购毛利率",
+            trigger: "blur"
           }
         ],
         cat_id: [
           {
             required: true,
-            message: '请选择商品分类',
-            trigger: 'change'
+            message: "请选择商品分类",
+            trigger: "change"
           }
         ],
         supplierNo: [
           {
-            type: 'array',
+            type: "array",
             required: true,
-            message: '请选择供应商公司',
-            trigger: 'change'
+            message: "请选择供应商公司",
+            trigger: "change"
           }
         ],
         qrdType: [
           {
             required: true,
-            message: '请输入订单来源',
-            trigger: 'blur'
+            message: "请输入订单来源",
+            trigger: "blur"
           }
         ],
         sale_total: [
           {
             required: true,
-            message: '请输入货款总金额',
-            trigger: 'blur'
+            message: "请输入货款总金额",
+            trigger: "blur"
           }
         ],
         // workCode: [
@@ -489,120 +482,120 @@ export default {
         poCode: [
           {
             required: true,
-            message: '请输入PO编号',
-            trigger: 'blur'
+            message: "请输入PO编号",
+            trigger: "blur"
           }
         ],
         khNo: [
           {
-            type: 'array',
+            type: "array",
             required: true,
-            message: '请选择购买方公司',
-            trigger: 'change'
+            message: "请选择购买方公司",
+            trigger: "change"
           }
         ],
         tax: [
           {
             required: true,
-            message: '请选择税率',
-            trigger: 'change'
+            message: "请选择税率",
+            trigger: "change"
           }
         ],
         companyNo: [
           {
             required: true,
-            message: '请选择销售方公司',
-            trigger: 'change'
+            message: "请选择销售方公司",
+            trigger: "change"
           }
         ],
         contactor: [
           {
             required: true,
-            message: '请输入收货人',
-            trigger: 'blur'
+            message: "请输入收货人",
+            trigger: "blur"
           }
         ],
         mobile: [
           {
             required: true,
             validator: validatemobile,
-            trigger: 'blur'
+            trigger: "blur"
           }
         ],
         addr: [
           {
             required: true,
-            message: '请输入联系地址',
-            trigger: 'blur'
+            message: "请输入联系地址",
+            trigger: "blur"
           }
         ],
 
         sendtime: [
           {
             required: true,
-            message: '请输入发货时间',
-            trigger: 'change'
+            message: "请输入发货时间",
+            trigger: "change"
           }
         ],
 
         goodName: [
           {
             required: true,
-            message: '请输入商品名称',
-            trigger: 'blur'
+            message: "请输入商品名称",
+            trigger: "blur"
           }
         ],
         goodPrice: [
           {
             required: true,
-            message: '请输入销售单价',
-            trigger: 'blur'
+            message: "请输入销售单价",
+            trigger: "blur"
           }
         ],
         cgdPrice: [
           {
             required: true,
-            message: '请选择采购单价',
-            trigger: 'blur'
+            message: "请选择采购单价",
+            trigger: "blur"
           }
         ],
         goodNum: [
           {
             required: true,
-            message: '请输入数量',
-            trigger: 'blur'
+            message: "请输入数量",
+            trigger: "blur"
           }
         ],
         cgd_total: [
           {
             required: true,
-            message: '请输入采购总额',
-            trigger: 'blur'
+            message: "请输入采购总额",
+            trigger: "blur"
           }
         ]
       }
-    }
+    };
   },
   computed: {
     totalWatchSource() {
-      const { goodNum, goodPrice } = this.ruleForm
-      return { goodNum, goodPrice }
+      const { goodNum, goodPrice } = this.ruleForm;
+      return { goodNum, goodPrice };
     },
     cgdTotalWatchSource() {
-      const { goodNum, cgdPrice } = this.ruleForm
-      return { goodNum, cgdPrice }
+      const { goodNum, cgdPrice } = this.ruleForm;
+      return { goodNum, cgdPrice };
     }
   },
   watch: {
     showModel: function(val) {
-      this.showModelThis = val
+      this.showModelThis = val;
       if (val) {
-        this.initForm()
+        this.initForm();
       }
     },
     showModelThis(val) {
       if (!val) {
-        this.$emit('cancel')
+        this.$emit("cancel");
       }
     }
     // totalWatchSource: {
@@ -630,88 +623,88 @@ export default {
   },
   methods: {
     async handleHandoverName(e) {
-      this.ruleForm.buyerid = e && e.id ? [e.id] : ''
-      this.ruleForm.buyer_name = e && e.label ? e.label : ''
-      this.$refs.ruleForm.validateField('buyerid')
+      this.ruleForm.buyerid = e && e.id ? [e.id] : "";
+      this.ruleForm.buyer_name = e && e.label ? e.label : "";
+      this.$refs.ruleForm.validateField("buyerid");
     },
     async select_area_change(e) {
-      this.ruleForm.addr_code = e
-      this.$refs.ruleForm.validateField('addr_code')
+      this.ruleForm.addr_code = e;
+      this.$refs.ruleForm.validateField("addr_code");
     },
     number_change(e, type) {
-      this.ruleForm[type] = e
+      this.ruleForm[type] = e;
     },
     handleClose() {
-      this.showModelThis = false
-      this.companyName = ''
-      this.khName = ''
-      this.supplierName = ''
-      this.ruleForm = { ...defaultData }
+      this.showModelThis = false;
+      this.companyName = "";
+      this.khName = "";
+      this.supplierName = "";
+      this.ruleForm = { ...defaultData };
     },
     async initForm() {
-      this.loading = true
+      this.loading = true;
       // await this.getAccounts();
 
-      if (this.id === '003') {
-        this.title = '添加销售订单信息'
-        this.rulesThis = this.rules
-      } else if (this.id === '005') {
-        this.title = '修改销售订单信息'
-        this.rulesThis = this.rules
+      if (this.id === "003") {
+        this.title = "添加销售订单信息";
+        this.rulesThis = this.rules;
+      } else if (this.id === "005") {
+        this.title = "修改销售订单信息";
+        this.rulesThis = this.rules;
       } else {
-        this.title = '销售订单信息详情'
-        this.rulesThis = {}
+        this.title = "销售订单信息详情";
+        this.rulesThis = {};
       }
-      await this.resetForm()
-      this.loading = false
+      await this.resetForm();
+      this.loading = false;
     },
 
     handleCompanyChange(e) {
-      this.ruleForm.companyNo = e.code || ''
-      this.$refs.ruleForm.validateField('companyNo')
+      this.ruleForm.companyNo = e.code || "";
+      this.$refs.ruleForm.validateField("companyNo");
     },
     handleCustomerChange(e) {
-      this.ruleForm.khNo = e.code ? [e.code] : ''
-      this.$refs.ruleForm.validateField('khNo')
+      this.ruleForm.khNo = e.code ? [e.code] : "";
+      this.$refs.ruleForm.validateField("khNo");
     },
     handleSupplierChange(e) {
-      this.ruleForm.supplierNo = e.code ? [e.code] : ''
-      this.$refs.ruleForm.validateField('supplierNo')
+      this.ruleForm.supplierNo = e.code ? [e.code] : "";
+      this.$refs.ruleForm.validateField("supplierNo");
     },
     handleGoodClassChange(e) {
-      this.ruleForm.cat_id = e
-      this.$refs.ruleForm.validateField('cat_id')
+      this.ruleForm.cat_id = e;
+      this.$refs.ruleForm.validateField("cat_id");
     },
     handleTaxChange(e) {
-      this.ruleForm.tax = e
-      this.$refs.ruleForm.validateField('tax')
+      this.ruleForm.tax = e;
+      this.$refs.ruleForm.validateField("tax");
     },
     unitsearchChange(e) {
-      const { id, code, label } = e
-      this.ruleForm.goodUnit = code ? [code] : []
-      this.$refs.ruleForm.validateField('goodUnit')
+      const { id, code, label } = e;
+      this.ruleForm.goodUnit = code ? [code] : [];
+      this.$refs.ruleForm.validateField("goodUnit");
     },
     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();
         }
-      })
+      });
 
-      if (this.id === '003') {
-        this.ruleForm.companyNo = this.currentCompany
-        return
+      if (this.id === "003") {
+        this.ruleForm.companyNo = this.currentCompany;
+        return;
       }
 
-      if (this.id !== '003') this.getDetail()
+      if (this.id !== "003") this.getDetail();
     },
     number_change_total(current, prop) {
       // const isCgdTotal = prop === 'cgd_total'
       // const { goodNum } = this.ruleForm
       // this.ruleForm[isCgdTotal ? 'cgdPrice' : 'goodPrice'] = accDiv(current, goodNum)
-      this.ruleForm[prop] = current
+      this.ruleForm[prop] = current;
 
       // let tax = 0
       // tax = accMul(accSub(1, accDiv(this.ruleForm.cgd_total, this.ruleForm.sale_total)), 100)
@@ -721,9 +714,9 @@ export default {
       // }
     },
     async getDetail() {
-      this.detailLoading = true
-      const { orderCode } = this.sitem
-      const { data } = await asyncRequest.detail({ orderCode })
+      this.detailLoading = true;
+      const { orderCode } = this.sitem;
+      const { data } = await asyncRequest.detail({ orderCode });
 
       const {
         cat_id,
@@ -737,31 +730,31 @@ export default {
         addr_code,
         unitName,
         ...rest
-      } = data
+      } = data;
 
       this.ruleForm = {
         ...rest,
         buyerid: buyerid ? [buyerid] : [],
-        addr_code: addr_code ? addr_code.split(',') : [],
+        addr_code: addr_code ? addr_code.split(",") : [],
         cat_id: cat_id ? [cat_id[cat_id.length - 1]] : [],
         supplierNo: supplierNo ? [supplierNo] : [],
         khNo: khNo ? [khNo] : [],
-        tax: tax ? tax + '%' : '',
-        goodUnit: goodUnit ? [goodUnit] : ''
-      }
+        tax: tax ? tax + "%" : "",
+        goodUnit: goodUnit ? [goodUnit] : ""
+      };
 
-      this.cat_id_name = cat_id.map(({ name }) => name).join('_')
-      this.unit_name = unitName
+      this.cat_id_name = cat_id.map(({ name }) => name).join("_");
+      this.unit_name = unitName;
 
-      this.khName = khName
-      this.supplierName = supplierNanme
-      this.detailLoading = false
+      this.khName = khName;
+      this.supplierName = supplierNanme;
+      this.detailLoading = false;
     },
     platform_codesearchChange(e) {
-      const { id, label, pay_name } = e
-      this.ruleForm.platform_id = id || ''
-      this.pay_name = pay_name || ''
-      this.$refs.ruleForm.validateField('platform_id')
+      const { id, label, pay_name } = e;
+      this.ruleForm.platform_id = id || "";
+      this.pay_name = pay_name || "";
+      this.$refs.ruleForm.validateField("platform_id");
     },
     // async getAccounts() {
     //   const res = await asyncRequest.accountall(this.dataForm);
@@ -774,60 +767,64 @@ export default {
     //   }
     // },
     async goods_class_change(e) {
-      const { id } = e
-      this.ruleForm.cat_id = id ? [id] : []
-      this.$refs.ruleForm.validateField('cat_id')
+      const { id } = e;
+      this.ruleForm.cat_id = id ? [id] : [];
+      this.$refs.ruleForm.validateField("cat_id");
     },
     async submitForm() {
-      await this.$refs.ruleForm.validate(async(valid) => {
+      await this.$refs.ruleForm.validate(async valid => {
         if (valid) {
           if (this.loading) {
-            return
+            return;
           }
 
-          this.loading = true
-          const model = JSON.parse(JSON.stringify(this.ruleForm))
-          model.supplierNo = model.supplierNo[0]
-          model.khNo = model.khNo[0]
-          model.buyerid = Array.isArray(model.buyerid) ? model.buyerid[0] : model.buyerid
-          model.cat_id = model.cat_id ? model.cat_id[model.cat_id.length - 1] : ''
-          model.addr_code = model.addr_code.join(',')
-          model.tax = model.tax.split('%')[0]
-          model.pay_name = this.pay_name
+          this.loading = true;
+          const model = JSON.parse(JSON.stringify(this.ruleForm));
+          model.supplierNo = model.supplierNo[0];
+          model.khNo = model.khNo[0];
+          model.buyerid = Array.isArray(model.buyerid)
+            ? model.buyerid[0]
+            : model.buyerid;
+          model.cat_id = model.cat_id
+            ? model.cat_id[model.cat_id.length - 1]
+            : "";
+          model.addr_code = model.addr_code.join(",");
+          model.tax = model.tax.split("%")[0];
+          model.pay_name = this.pay_name;
           model.goodUnit = Array.isArray(model.goodUnit)
             ? model.goodUnit[0]
-            : model.goodUnit
+            : model.goodUnit;
 
-          let res = {}
-          if (this.id === '003') {
-            delete model['id']
-            res = await asyncRequest.add(model)
+          let res = {};
+          if (this.id === "003") {
+            delete model["id"];
+            res = await asyncRequest.add(model);
           } else {
-            res = await asyncRequest.update(model)
+            res = await asyncRequest.update(model);
           }
-          this.loading = false
+          this.loading = false;
           if (res && res.code === 0) {
-            const title = this.id === '003' ? '添加成功!' : '修改成功!'
+            const title = this.id === "003" ? "添加成功!" : "修改成功!";
             this.$notify.success({
               title,
-              message: ''
-            })
-            this.showModelThis = false
+              message: ""
+            });
+            this.showModelThis = false;
             // 刷新
-            this.$emit('refresh')
+            this.$emit("refresh");
           } else if (res && res.code >= 100 && res.code <= 104) {
-            await this.logout()
+            await this.logout();
           } else {
-            this.$message.warning(res.message)
+            this.$message.warning(res.message);
           }
         } else {
-          console.log('error submit!!')
-          return false
+          console.log("error submit!!");
+          return false;
         }
-      })
+      });
     }
   }
-}
+};
 </script>
 
 <style lang="scss" scoped>

src/views/netOrderEntry/prestoreRecordingOrders/importTemplateModal.vue

@@ -7,29 +7,36 @@
     :close-on-click-modal="false"
     @close="innerVisible = false; tableData = []"
   >
+    <div style="margin-bottom:20px;display:flex;align-items:center">
+      <span style="color:red">*</span>
+      <p style="width:80px">项目经理:</p>
+      <project-manager
+        size="mini"
+        :isDetail="true"
+        :value="ruleForm.manager"
+        @searchChange="managerChange"
+      />
+    </div>
+
     <div v-if="tableData && tableData.length > 0" class="tr" style="padding: 10px 0 0 0">
       <el-button :size="'mini'" @click="() => tableData = []">取消</el-button>
       <el-button type="primary" :size="'mini'" :loading="loading" @click="onSubmit">提交</el-button>
     </div>
+
     <div v-else>
       <upload-excel :on-success="onSuccess" :before-upload="beforeUpload" />
     </div>
 
-    <ex-table
-      :columns="columns"
-      :table="table"
-      :data="tableData"
-      style="margin: 15px 0 0 0"
-    />
+    <ex-table :columns="columns" :table="table" :data="tableData" style="margin: 15px 0 0 0" />
   </el-dialog>
 </template>
 
 <script>
-import asyncRequest from '@/apis/service/netOrderEntry/netOrderEnter'
-import { isMobile } from '@/utils/validate'
-import companyHelper from '@/mixins/companyHelper'
-import { replaceTextWrapAndSpace } from '../../../utils'
-import { MessageBox } from 'element-ui'
+import asyncRequest from "@/apis/service/netOrderEntry/netOrderEnter";
+import { isMobile } from "@/utils/validate";
+import companyHelper from "@/mixins/companyHelper";
+import { replaceTextWrapAndSpace } from "../../../utils";
+import { MessageBox } from "element-ui";
 
 import {
   columns,
@@ -41,130 +48,153 @@ import {
   numberFields,
   getTableLabel,
   intNumberFields
-} from './template'
+} from "./template";
 
 export default {
   mixins: [companyHelper],
-  props: ['visible'],
+  props: ["visible"],
   data() {
     return {
       columns,
       loading: false,
       tableData: [],
+      ruleForm: {
+        manager: ""
+      },
       table: {
         stripe: true,
         border: true,
-        'max-height': '800px'
+        "max-height": "800px"
       }
-    }
+    };
   },
   computed: {
     innerVisible: {
       get() {
-        return this.visible
+        return this.visible;
       },
       set(newVal) {
-        this.$emit('update:visible', newVal)
+        this.$emit("update:visible", newVal);
       }
     }
   },
   methods: {
+    managerChange(e) {
+      const { id } = e;
+      this.ruleForm.manager = id ? [id] : [];
+    },
     validateTableHeader(header, importHeader) {
-      let isHeaderOk = true
-      if (header.length !== importHeader.length) return false
+      let isHeaderOk = true;
+      if (header.length !== importHeader.length) return false;
       for (const index in header) {
-        const field = header[index]
-        const importField = importHeader[index]
+        const field = header[index];
+        const importField = importHeader[index];
         if (field !== importField) {
-          isHeaderOk = false
-          break
+          isHeaderOk = false;
+          break;
         }
       }
 
-      return isHeaderOk
+      return isHeaderOk;
     },
     /* 校验导入的销售方列表编码(与选择的公司必须一致) **/
     validateCompanyNo(value, row) {
-      const verification = createFieldVerification()
-      const current = this.currentCompany
+      const verification = createFieldVerification();
+      const current = this.currentCompany;
       if (value !== current) {
-        verification.isValid = false
-        verification.message = `第 ${row} 行,销售方公司必须与选择的公司一致`
-        return verification
+        verification.isValid = false;
+        verification.message = `第 ${row} 行,销售方公司必须与选择的公司一致`;
+        return verification;
       }
-      return verification
+      return verification;
     },
     /* 校验导入的购买方列表编码(开头必须为KH) **/
     validateKhNo(value, row) {
-      const verification = createFieldVerification()
-      const perfix = String(value || '').slice(0, 2)
-      if (perfix !== 'KH') {
-        verification.isValid = false
-        verification.message = `第 ${row} 行,"购买方公司编码必须以'KH'开头`
-        return verification
+      const verification = createFieldVerification();
+      const perfix = String(value || "").slice(0, 2);
+      if (perfix !== "KH") {
+        verification.isValid = false;
+        verification.message = `第 ${row} 行,"购买方公司编码必须以'KH'开头`;
+        return verification;
       }
-      return verification
+      return verification;
     },
-    formatDate2(serialNumber, format = '-', mao = ':') {
-      var timestamp = (serialNumber - 25569 - 8 / 24) * 86400 * 1000 // 转换为时间戳
-      var newDate = new Date(timestamp) // 转换为日期时间对象
-      const year = newDate.getFullYear() // 获取年份，例如 2023
-      const month = newDate.getMonth() + 1 // 获取月份，注意需要加上 1，例如 4
-      const day = newDate.getDate() // 获取日期，例如 9
-      let hours = newDate.getHours() // 获取小时，例如 0
-      let minutes = newDate.getMinutes() // 获取分钟，例如 0
-      let seconds = newDate.getSeconds() // 获取秒数，例如 0
+    formatDate2(serialNumber, format = "-", mao = ":") {
+      var timestamp = (serialNumber - 25569 - 8 / 24) * 86400 * 1000; // 转换为时间戳
+      var newDate = new Date(timestamp); // 转换为日期时间对象
+      const year = newDate.getFullYear(); // 获取年份，例如 2023
+      const month = newDate.getMonth() + 1; // 获取月份，注意需要加上 1，例如 4
+      const day = newDate.getDate(); // 获取日期，例如 9
+      let hours = newDate.getHours(); // 获取小时，例如 0
+      let minutes = newDate.getMinutes(); // 获取分钟，例如 0
+      let seconds = newDate.getSeconds(); // 获取秒数，例如 0
 
       // 判断小时、分钟和秒是否小于 10，如果是，则在前面补一个零
       if (hours < 10) {
-        hours = '0' + hours
+        hours = "0" + hours;
       }
       if (minutes < 10) {
-        minutes = '0' + minutes
+        minutes = "0" + minutes;
       }
       if (seconds < 10) {
-        seconds = '0' + seconds
+        seconds = "0" + seconds;
       }
-      return year + '-' + month + '-' + day + ' ' + hours + ':' + minutes + ':' + seconds
+      return (
+        year +
+        "-" +
+        month +
+        "-" +
+        day +
+        " " +
+        hours +
+        ":" +
+        minutes +
+        ":" +
+        seconds
+      );
     },
     /* 校验导入的联系电话是否合法 **/
     validateMobile(value, row) {
-      const verification = createFieldVerification()
+      const verification = createFieldVerification();
       if (!isMobile(value)) {
-        verification.isValid = false
-        verification.message = `第${Number(row)}行,联系方式,手机号格式不正确`
-        return verification
+        verification.isValid = false;
+        verification.message = `第${Number(row)}行,联系方式,手机号格式不正确`;
+        return verification;
       }
-      return verification
+      return verification;
     },
     /* 校验导入的购买方列表编码(开头必须为QS) **/
     validateSupplierNo(value, row) {
-      const verification = createFieldVerification()
-      const perfix = String(value || '').slice(0, 2)
-      if (perfix !== 'QS') {
-        verification.isValid = false
-        verification.message = `第 ${row} 供应商公司编码必须以'QS'开头`
-        return verification
+      const verification = createFieldVerification();
+      const perfix = String(value || "").slice(0, 2);
+      if (perfix !== "QS") {
+        verification.isValid = false;
+        verification.message = `第 ${row} 供应商公司编码必须以'QS'开头`;
+        return verification;
       }
-      return verification
+      return verification;
     },
     validateNumberField(field, value, row) {
-      const verification = createFieldVerification()
+      const verification = createFieldVerification();
       if (!/^\d*\.?\d+$/.test(value)) {
-        verification.isValid = false
-        verification.message = `第${Number(row)}行,${getTableLabel(field)}必须为数字,且不能小于0`
-        return verification
+        verification.isValid = false;
+        verification.message = `第${Number(row)}行,${getTableLabel(
+          field
+        )}必须为数字,且不能小于0`;
+        return verification;
       }
-      return verification
+      return verification;
     },
     validateIntNumberField(field, value, row) {
-      const verification = createFieldVerification()
+      const verification = createFieldVerification();
       if (!/^\d+$/.test(value)) {
-        verification.isValid = false
-        verification.message = `第${Number(row)}行,${getTableLabel(field)}必须为正整数`
-        return verification
+        verification.isValid = false;
+        verification.message = `第${Number(row)}行,${getTableLabel(
+          field
+        )}必须为正整数`;
+        return verification;
       }
-      return verification
+      return verification;
     },
     /* 校验导入的税率、数量、采购单价、销售单价是否为数字 **/
     validateDateField(value) {
@@ -174,178 +204,223 @@ export default {
       //   verification.message = `第${Number(index)}行,发货日期不能为空,且必须为日期格式`
       //   return verification
       // }
-      return /^\d{4}-\d{1,2}-\d{1,2}\s\d{1,2}:\d{1,2}:\d{1,2}$/.test(value)
+      return /^\d{4}-\d{1,2}-\d{1,2}\s\d{1,2}:\d{1,2}:\d{1,2}$/.test(value);
     },
     validateRequiredField(field, value, row) {
-      const verification = createFieldVerification()
-      if (replaceTextWrapAndSpace(value) === '') {
-        verification.isValid = false
-        verification.message = `第${row}行,${getTableLabel(field)}不能为空`
-        return verification
+      const verification = createFieldVerification();
+      if (replaceTextWrapAndSpace(value) === "") {
+        verification.isValid = false;
+        verification.message = `第${row}行,${getTableLabel(field)}不能为空`;
+        return verification;
       }
-      return verification
+      return verification;
     },
     /* 处理不合法的值,提示错误信息,并返回最终的验证状态 **/
     handleNotValidFields(...validFns) {
-      let isFinalValid = true
+      let isFinalValid = true;
       for (const validFn of validFns) {
-        const { message, isValid } = validFn()
+        const { message, isValid } = validFn();
         if (!isValid) {
-          isFinalValid = false
-          MessageBox({ type: 'warning', title: '数据填写错误', message })
-          break
+          isFinalValid = false;
+          MessageBox({ type: "warning", title: "数据填写错误", message });
+          break;
         }
       }
-      return isFinalValid
+      return isFinalValid;
     },
     /* 校验导入的数据 **/
     validateFields(tableData = []) {
-      let verification = null
+      let verification = null;
       for (const row in tableData) {
-        if (row === 'remove') {
-          continue
+        if (row === "remove") {
+          continue;
         }
 
-        const tableItem = tableData[row]
-        const index = Number(row) + 1
+        const tableItem = tableData[row];
+        const index = Number(row) + 1;
 
         for (const field in tableItem) {
           if (requiredFields.includes(field)) {
-            verification = this.validateRequiredField(field, tableItem[field], index)
+            verification = this.validateRequiredField(
+              field,
+              tableItem[field],
+              index
+            );
             if (!verification.isValid) {
-              MessageBox({ type: 'warning', title: '数据填写错误', message: verification.message })
-              return false
+              MessageBox({
+                type: "warning",
+                title: "数据填写错误",
+                message: verification.message
+              });
+              return false;
             }
           }
 
           if (intNumberFields.includes(field)) {
-            verification = this.validateIntNumberField(field, tableItem[field], index)
+            verification = this.validateIntNumberField(
+              field,
+              tableItem[field],
+              index
+            );
             if (!verification.isValid) {
-              MessageBox({ type: 'warning', title: '数据填写错误', message: verification.message })
-              return false
+              MessageBox({
+                type: "warning",
+                title: "数据填写错误",
+                message: verification.message
+              });
+              return false;
             }
           }
 
           if (numberFields.includes(field)) {
-            verification = this.validateNumberField(field, tableItem[field], index)
+            verification = this.validateNumberField(
+              field,
+              tableItem[field],
+              index
+            );
             if (!verification.isValid) {
-              MessageBox({ type: 'warning', title: '数据填写错误', message: verification.message })
-              return false
+              MessageBox({
+                type: "warning",
+                title: "数据填写错误",
+                message: verification.message
+              });
+              return false;
             }
           }
 
           if (field === PROPERTYS.MOBILE) {
-            verification = this.validateMobile(tableItem[field], index)
+            verification = this.validateMobile(tableItem[field], index);
             if (!verification.isValid) {
-              MessageBox({ type: 'warning', title: '数据填写错误', message: verification.message })
-              return false
+              MessageBox({
+                type: "warning",
+                title: "数据填写错误",
+                message: verification.message
+              });
+              return false;
             }
           }
 
           if (field === PROPERTYS.CUSTOMER_NO) {
-            verification = this.validateKhNo(tableItem[field], index)
+            verification = this.validateKhNo(tableItem[field], index);
             if (!verification.isValid) {
-              MessageBox({ type: 'warning', title: '数据填写错误', message: verification.message })
-              return false
+              MessageBox({
+                type: "warning",
+                title: "数据填写错误",
+                message: verification.message
+              });
+              return false;
             }
           }
 
           if (field === PROPERTYS.COMPANY_NO) {
-            verification = this.validateCompanyNo(tableItem[field], index)
+            verification = this.validateCompanyNo(tableItem[field], index);
             if (!verification.isValid) {
-              MessageBox({ type: 'warning', title: '数据填写错误', message: verification.message })
-              return false
+              MessageBox({
+                type: "warning",
+                title: "数据填写错误",
+                message: verification.message
+              });
+              return false;
             }
           }
 
           if (field === PROPERTYS.SUPPLIER_NO) {
-            verification = this.validateSupplierNo(tableItem[field], index)
+            verification = this.validateSupplierNo(tableItem[field], index);
             if (!verification.isValid) {
-              MessageBox({ type: 'warning', title: '数据填写错误', message: verification.message })
-              return false
+              MessageBox({
+                type: "warning",
+                title: "数据填写错误",
+                message: verification.message
+              });
+              return false;
             }
           }
         }
       }
-      return true
+      return true;
     },
     mapTemplateItemToTableItem(templateItem) {
-      const tableItem = {}
-      const templatePropertys = Object.keys(templateItem)
+      const tableItem = {};
+      const templatePropertys = Object.keys(templateItem);
       templatePropertys.forEach(templateProperty => {
-        const tableproperty = getTableProperty(templateProperty)
-        tableItem[tableproperty] = templateItem[templateProperty]
-      })
-      return tableItem
+        const tableproperty = getTableProperty(templateProperty);
+        tableItem[tableproperty] = templateItem[templateProperty];
+      });
+      return tableItem;
     },
     onSuccess({ results: templateItems, header: templateHeader }) {
       if (templateItems.length > 1000) {
-        this.$message.error('导入数据不能超过 1000 条')
-        return
+        this.$message.error("导入数据不能超过 1000 条");
+        return;
       }
 
       const isHeaderValid = this.validateTableHeader(
         this.columns.map(({ label }) => label).slice(1),
         templateHeader
-      )
+      );
       if (!isHeaderValid) {
-        this.$message.warning('表格与导入的表头不一致!')
-        return
+        this.$message.warning("表格与导入的表头不一致!");
+        return;
       }
       if (templateItems.length === 0) {
-        this.$message.warning('导入的表格没有数据!')
-        return
+        this.$message.warning("导入的表格没有数据!");
+        return;
       }
       templateItems.forEach(templateItem => {
-        const tableItem = this.mapTemplateItemToTableItem(templateItem)
+        const tableItem = this.mapTemplateItemToTableItem(templateItem);
         Object.keys(tableItem).forEach(field => {
-          let target = ''
+          let target = "";
           if (field === PROPERTYS.SEND_TIME) {
             target = this.validateDateField(tableItem[PROPERTYS.SEND_TIME])
               ? tableItem[PROPERTYS.SEND_TIME]
-              : this.formatDate2(tableItem[PROPERTYS.SEND_TIME])
+              : this.formatDate2(tableItem[PROPERTYS.SEND_TIME]);
           } else {
-            target = tableItem[field] ? String(tableItem[field]).trim() : ''
+            target = tableItem[field] ? String(tableItem[field]).trim() : "";
           }
-          tableItem[field] = target
-        })
-        this.tableData.push(tableItem)
-      })
+          tableItem[field] = target;
+        });
+        this.tableData.push(tableItem);
+      });
 
-      this.validateFields(this.tableData)
+      this.validateFields(this.tableData);
     },
     async onSubmit() {
-      if (!this.validateFields(this.tableData)) return
+      if (!this.validateFields(this.tableData)) return;
 
-      const list = this.tableData.map(tableItem => requsetFields.reduce((prev, currentKey) => ({
-        ...prev,
-        workCode: '',
-        [currentKey]: tableItem[currentKey]
-      }), {}))
+      const list = this.tableData.map(tableItem =>
+        requsetFields.reduce(
+          (prev, currentKey) => ({
+            ...prev,
+            workCode: "",
+            [currentKey]: tableItem[currentKey]
+          }),
+          {}
+        )
+      );
 
-      this.loading = true
+      this.loading = true;
       const result = await asyncRequest.importOrder({
         list
-      })
-      this.loading = false
+      });
+      this.loading = false;
 
       switch (String(result.code)) {
-        case '0':
-          this.$message.success('导入成功')
-          this.innerVisible = false
-          this.$emit('refresh')
-          break
+        case "0":
+          this.$message.success("导入成功");
+          this.innerVisible = false;
+          this.$emit("refresh");
+          break;
         default:
-          this.$message.warning(result.message)
-          break
+          this.$message.warning(result.message);
+          break;
       }
     }
   }
-}
+};
 </script>
 
 <style lang="scss">
-.error-message__wrapper{
+.error-message__wrapper {
   width: 1024px;
 }
 </style>

src/views/netOrderEntry/prestoreRecordingOrders/index.vue

@@ -35,23 +35,25 @@
               />
             </el-col>
             <el-col :span="4" style="width: 160px; padding: 0 0 0 10px">
-              <el-select v-model="parmValue.status" size="mini" clearable
-                  @change="pageInfo.curr = 1;  parmValue.page = 1; searchList();"
-                >
+              <el-select
+                v-model="parmValue.status"
+                size="mini"
+                clearable
+                @change="pageInfo.curr = 1;  parmValue.page = 1; searchList();"
+              >
                 <el-option label="未转单" value="1"></el-option>
                 <el-option label="已转单" value="2"></el-option>
               </el-select>
             </el-col>
 
-
             <el-col :span="3" style="margin-left:10px">
-              <el-switch 
-                 v-model="parmValue.use_type"
-                 :active-value="usetypeOtions[1].value"
-                 :inactive-value="usetypeOtions[0].value"
-                 :active-text="usetypeOtions[1].label"
-                 :inactive-text="usetypeOtions[0].label"
-                 @change="
+              <el-switch
+                v-model="parmValue.use_type"
+                :active-value="usetypeOtions[1].value"
+                :inactive-value="usetypeOtions[0].value"
+                :active-text="usetypeOtions[1].label"
+                :inactive-text="usetypeOtions[0].label"
+                @change="
                    pageInfo.curr = 1;
                    parmValue.page = 1;
                    searchList();
@@ -60,14 +62,10 @@
             </el-col>
 
             <el-col :span="3" class="fr" style="width: 66px; padding: 0 0 0 10px">
-              <el-button type="primary" :size="searchSize" @click="searchList"
-                >刷新</el-button
-              >
+              <el-button type="primary" :size="searchSize" @click="searchList">刷新</el-button>
             </el-col>
             <el-col :span="3" class="fr" style="width: 66px; padding: 0 0 0 10px">
-              <el-button type="warning" :size="searchSize" @click="restSearch"
-                >重置</el-button
-              >
+              <el-button type="warning" :size="searchSize" @click="restSearch">重置</el-button>
             </el-col>
             <!-- <el-col
               :span="3"
@@ -78,10 +76,9 @@
               <el-button type="success" :size="searchSize" @click="openModal({}, '003')"
                 >添加</el-button
               >
-            </el-col> -->
+            </el-col>-->
           </el-row>
           <el-row>
-
             <el-col :span="6" style="width: 373px">
               <search-customer
                 size="mini"
@@ -105,22 +102,32 @@
             </el-col>
 
             <el-col span="2" style="padding-left:25px">
-              <el-input size="mini" style="width:110%" placeholder="商品名称" clearable v-model="parmValue.good_name" @change="
+              <el-input
+                size="mini"
+                style="width:110%"
+                placeholder="商品名称"
+                clearable
+                v-model="parmValue.good_name"
+                @change="
                    pageInfo.curr = 1;
                    parmValue.page = 1;
                    searchList();
-                 " />
+                 "
+              />
             </el-col>
 
-            <el-col :span="3" class="fr" style="width: 116px; padding: 0 0 0 10px" v-if="powers.includes('013') && !isSupertube">
+            <el-col
+              :span="3"
+              class="fr"
+              style="width: 116px; padding: 0 0 0 10px"
+              v-if="powers.includes('013') && !isSupertube"
+            >
               <el-button
                 class="fr"
                 type="primary"
                 :size="searchSize"
                 @click="downloadTemplate"
-              >
-                下载导入模板
-              </el-button>
+              >下载导入模板</el-button>
             </el-col>
             <el-col :span="3" class="fr" style="width: 116px; padding: 0 0 0 10px">
               <el-button
@@ -128,9 +135,7 @@
                 class="fr"
                 :size="searchSize"
                 @click="() => (templateModalVisible = true)"
-              >
-                导入订单数据
-              </el-button>
+              >导入订单数据</el-button>
             </el-col>
           </el-row>
         </div>
@@ -188,7 +193,7 @@
     <no-auth v-else></no-auth>
 
     <import-template-modal :visible.sync="templateModalVisible" @refresh="() => searchList()" />
-    
+
     <!-- 弹窗 新增/修改 -->
     <add-edit
       :id="modelId"
@@ -201,7 +206,6 @@
 </template>
 <script>
 import asyncRequest from "@/apis/service/netOrderEntry/prestoreRecordingOrders";
-import { xs_order_type_options, xs_order_source_options } from "@/assets/js/statusList";
 import { statusList } from "@/assets/js/statusList";
 import mixinPage from "@/mixins/elPaginationHandle";
 import roleLevel from "@/assets/js/roleLevel";
@@ -214,27 +218,33 @@ import importTemplateModal from "./importTemplateModal.vue";
 import { usetypeOtions } from "@/assets/js/statusList";
 import { template } from "./template";
 
+import {
+  xs_order_type_options,
+  xs_order_source_options
+} from "@/assets/js/statusList";
+
 export default {
   name: "netOrderEnter",
   mixins: [mixinPage, resToken, companyHelper],
   components: {
     addEdit,
-    importTemplateModal,
+    importTemplateModal
   },
   computed: {
     //组件SIZE设置
     ...mapGetters(["tablebtnSize", "searchSize", "size", "isSupertube"]),
     powers() {
       const { btnList } = this.$store.getters;
-      const tran = btnList.find((i) => i.menu_route == "prestoreRecordingOrders") || {};
+      const tran =
+        btnList.find(i => i.menu_route == "prestoreRecordingOrders") || {};
       const { action } = tran ?? {};
       return action ?? [];
-    },
+    }
   },
   data() {
     const mapSelectValue2Query = {
       orderCode: "销售订单编号",
-      cgdNo: "采购单编号",
+      cgdNo: "采购单编号"
     };
 
     return {
@@ -255,12 +265,12 @@ export default {
       parmValue: {
         page: 1, // 页码
         size: 15, // 每页显示条数
-        use_type:"1",
-        platform_id:"",
+        use_type: "1",
+        platform_id: "",
         start: "",
         end: "",
         customer: "",
-        status:''
+        status: ""
       },
       // 表格 - 数据
       tableData: [],
@@ -268,87 +278,87 @@ export default {
       table: {
         stripe: true,
         border: true,
-        _defaultHeader_: ["setcol"],
+        _defaultHeader_: ["setcol"]
       },
       statusOptions: [
         { id: "0", label: "待发货" },
         { id: "1", label: "待发货完成" },
         { id: "2", label: "发货已完成" },
-        { id: "3", label: "订单已取消" },
+        { id: "3", label: "订单已取消" }
       ],
       // 表格 - 分页
       pageInfo: {
         size: 15,
         curr: 1,
-        total: 0,
+        total: 0
       },
       columns: [
         {
           prop: "interNo",
           label: "录单编号",
-          width: "175px",
+          width: "175px"
         },
         {
           prop: "orderCode",
           label: "订单编号",
-          width: "175px",
+          width: "175px"
         },
         {
           prop: "good_name",
           label: "商品名称",
-          width: "150",
+          width: "150"
         },
         {
           prop: "good_num",
-          label: "商品数量",
+          label: "商品数量"
         },
         {
           prop: "sale_price",
-          label: "销售单价",
+          label: "销售单价"
         },
         {
           prop: "sale_total",
-          label: "销售总价",
+          label: "销售总价"
         },
         {
-          prop:'status',
-          label:'状态',
-          _slot_:'status'
+          prop: "status",
+          label: "状态",
+          _slot_: "status"
         },
         {
-          prop:'platform_name',
-          label:'平台名称',
-          width:'125px'
+          prop: "platform_name",
+          label: "平台名称",
+          width: "125px"
         },
         {
           prop: "supplierNo",
           label: "供应商公司编号",
-          width: "155px",
+          width: "155px"
         },
         {
           prop: "supplierName",
           label: "供应商公司名称",
-          width: "125px",
+          width: "125px"
         },
         {
           prop: "customerNo",
           label: "购买方公司编号",
-          width: "155px",
+          width: "155px"
         },
         {
           prop: "customerName",
           label: "购买方公司名称",
-          width: "125px",
+          width: "125px"
         },
         {
           prop: "companyNo",
           label: "销售方公司编码",
-          width: "125px",
+          width: "125px"
         },
         {
           prop: "companyName",
           label: "销售方公司名称",
-          width: "125px",
+          width: "125px"
         },
         // {
         //   prop: "company_name",
@@ -358,7 +368,7 @@ export default {
         {
           prop: "apply_name",
           label: "创建人",
-          width: "85px",
+          width: "85px"
         },
         // {
         //   prop: "cgder",
@@ -373,7 +383,7 @@ export default {
         {
           prop: "addtime",
           label: "创建时间",
-          width: "145px",
+          width: "145px"
         },
         {
           prop: "",
@@ -381,9 +391,9 @@ export default {
           fixed: "right",
           _noset_: true,
           width: "80px",
-          _slot_: "operation",
-        },
-      ],
+          _slot_: "operation"
+        }
+      ]
     };
   },
   mounted() {
@@ -395,7 +405,7 @@ export default {
       const workSheet = new utils.json_to_sheet(template);
       utils.book_append_sheet(workBook, workSheet, "sheet");
       writeFile(workBook, "采销订单补录.xlsx", {
-        bookType: "xlsx",
+        bookType: "xlsx"
       });
     },
     restSearch() {
@@ -403,7 +413,7 @@ export default {
       this.pageInfo = {
         size: 15,
         curr: 1,
-        total: 0,
+        total: 0
       };
       this.parmValue = {
         page: 1, // 页码
@@ -412,15 +422,15 @@ export default {
         end: "",
         customer: "",
         supplierNo: "",
-        good_name:""
+        good_name: ""
       };
       this.value = "";
       this.searchList();
     },
     platform_codesearchChange(e) {
-      const { id, label, pay_name } = e
-      this.parmValue.platform_id = id || ''
-      this.searchList()
+      const { id } = e;
+      this.parmValue.platform_id = id || "";
+      this.searchList();
     },
     // 新建/编辑/详情
     openModal(row, type) {
@@ -465,20 +475,20 @@ export default {
       await this.$confirm(`确定要改为${status === "1" ? "禁用" : "启用"}？`, {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
-        type: "warning",
+        type: "warning"
       })
         .then(async () => {
           this.loading = true;
           const model = {
             id: id,
-            status: status === "1" ? "0" : "1",
+            status: status === "1" ? "0" : "1"
           };
           const res = await asyncRequest.status(model);
           if (res && res.code === 0) {
             this.loading = false;
             this.$notify.success({
               title: "状态修改成功！",
-              message: "",
+              message: ""
             });
             await this.searchList();
           } else if (res && res.code >= 100 && res.code <= 104) {
@@ -507,8 +517,12 @@ export default {
       const res = await asyncRequest.list({
         ...vm.parmValue,
         ...(vm.value ? { [vm.select]: vm.value } : {}),
-        ...(vm.parmValue.customer  ? { customer: vm.parmValue.customer[0] }: {}),
-        ...(vm.parmValue.supplierNo ? { supplierNo: vm.parmValue.supplierNo[0] } : {}),
+        ...(vm.parmValue.customer
+          ? { customer: vm.parmValue.customer[0] }
+          : {}),
+        ...(vm.parmValue.supplierNo
+          ? { supplierNo: vm.parmValue.supplierNo[0] }
+          : {})
       });
 
       if (res && res.code === 0 && res.data) {
@@ -521,8 +535,8 @@ export default {
         vm.pageInfo.total = 0;
       }
       vm.loading = false;
-    },
-  },
+    }
+  }
 };
 </script>
 

src/views/orderEntry/orderImport/index.vue

@@ -1,11 +1,21 @@
 <template>
   <div class="orderImport pagePadding" v-loading="loading">
-  
-    <div class="tr" style="padding: 10px 0 0 0"   v-if="tableData && tableData.length > 0">
+    <div style="margin-bottom:20px;display:flex;align-items:center">
+      <span style="color:red">*</span>
+      <p style="width:90px">项目经理:</p>
+      <project-manager
+        size="mini"
+        :isDetail="true"
+        :value="ruleForm.manager"
+        @searchChange="managerChange"
+      />
+    </div>
+
+    <div class="tr" style="padding: 10px 0 0 0" v-if="tableData && tableData.length > 0">
       <el-form
+        status-icon
         ref="ruleForm"
         :model="ruleForm"
-        status-icon
         :size="'mini'"
         :rules="rulesThis"
         label-width="120px"
@@ -33,30 +43,17 @@
               :size="'mini'"
               class="fr"
               style="margin: 0 0 0 10px"
-              >提交</el-button
-            >
-            <el-button
-              @click="resetForm"
-              :size="'mini'"
-              class="fr"
-              style="margin: 0 0 0 10px"
-              >取消</el-button
-            >
+            >提交</el-button>
+            <el-button @click="resetForm" :size="'mini'" class="fr" style="margin: 0 0 0 10px">取消</el-button>
           </el-col>
         </el-row>
       </el-form>
     </div>
-    
+
     <div v-else>
       <upload-excel :on-success="handleSuccess" :before-upload="beforeUpload" />
     </div>
-    <ex-table
-      :columns="columns"
-      :table="table"
-      :data="tableData"
-      style="margin: 15px 0 0 0"
-    >
-    </ex-table>
+    <ex-table :columns="columns" :table="table" :data="tableData" style="margin: 15px 0 0 0"></ex-table>
   </div>
 </template>
 
@@ -71,13 +68,14 @@ export default {
   data() {
     return {
       ruleForm: {
-        platform_id: "",
+        manager: "",
+        platform_id: ""
       },
       // 表格 - 参数
       table: {
         stripe: true,
         border: true,
-        "max-height": "800px",
+        "max-height": "800px"
         // _defaultHeader_: ["setcol"],
       },
       tableData: [],
@@ -85,7 +83,7 @@ export default {
       pageInfo: {
         size: 15,
         curr: 1,
-        total: 0,
+        total: 0
       },
       rulesThis: this.rules,
       rules: {
@@ -93,9 +91,9 @@ export default {
           {
             required: true,
             message: "请选择导入目标平台",
-            trigger: "change",
-          },
-        ],
+            trigger: "change"
+          }
+        ]
       },
       loading: false,
       // 表格 - 列参数
@@ -105,13 +103,17 @@ export default {
       btnFlag: false,
 
       //编辑全局锁
-      editBtnFlag: false,
+      editBtnFlag: false
     };
   },
   mounted() {
     this.resetForm();
   },
   methods: {
+    managerChange(e) {
+      const { id, label } = e;
+      this.ruleForm.manager = id ? [id] : [];
+    },
     async resetForm() {
       this.loading = false;
       this.rulesThis = this.rules;
@@ -122,7 +124,7 @@ export default {
           this.$refs.ruleForm.resetFields();
           this.$refs.ruleForm.clearValidate();
           this.ruleForm = {
-            platform_id: "", // 账号
+            platform_id: "" // 账号
           };
         }
       });
@@ -139,7 +141,7 @@ export default {
       }
       this.$message({
         message: "请不要上传大于1MB的文件.",
-        type: "warning",
+        type: "warning"
       });
       return false;
     },
@@ -160,15 +162,13 @@ export default {
           "平台商品编号",
           "单价（元）",
           "数量",
-          // "优惠前总金额",
           "订单总金额",
-          // "商品优惠后金额",
           "优惠活动名称",
           "收费模式",
           "收货人",
           "联系电话",
           "联系地址",
-          "订单备注",
+          "订单备注"
         ];
         if (head.length !== header.length) {
           this.$message.error("表头与导入模板不匹配！");
@@ -178,7 +178,7 @@ export default {
         let hederOk = true;
         head.forEach((v1, i1) => {
           if (v1 !== header[i1].replace(/\s*/g, "")) {
-            console.log(v1 + "----" + header[i1]);
+            // console.log(v1 + "----" + header[i1]);
             hederOk = false;
           }
         });
@@ -208,7 +208,7 @@ export default {
               contactor: b[10] + "",
               mobile: b[11] + "",
               addr: b[12] + "",
-              order_remark: b[13] + "",
+              order_remark: b[13] + ""
             };
 
             this.tableData.push(model);
@@ -221,7 +221,7 @@ export default {
 
     //提交
     async submit() {
-      await this.$refs.ruleForm.validate(async (valid) => {
+      await this.$refs.ruleForm.validate(async valid => {
         if (valid) {
           if (!this.loading) {
             this.loading = true;
@@ -232,11 +232,11 @@ export default {
             }
             const { platform_id } = this.ruleForm;
             let list = JSON.parse(JSON.stringify(this.tableData));
-            list.forEach((a) => {
+            list.forEach(a => {
               a.platform_id = platform_id;
             });
             let model = {
-              list: list,
+              list: list
             };
             const { code, data, message } = await asyncRequest.orderimport(
               model
@@ -245,7 +245,7 @@ export default {
             if (code === 0) {
               this.$notify.success({
                 title: "导入成功！",
-                message: "",
+                message: ""
               });
               await this.resetForm();
             } else if (code >= 100 && code <= 104) {
@@ -259,8 +259,8 @@ export default {
           return false;
         }
       });
-    },
-  },
+    }
+  }
 };
 </script>
 

src/views/sellOut/filing/config/columns.js

@@ -1036,7 +1036,13 @@ const rules = {
       trigger: "change",
     },
   ],
-
+  manager:[
+    {
+      required:true,
+      message:'请选择项目经理',
+      trigger:'change'
+    }
+  ],
   cost_desc: [
     {
       required: false,
@@ -1117,6 +1123,7 @@ const other_ruleForm = {
   is_diff: "0",
 };
 const ruleForm1 = {
+  manager:"",
   customerName:"",
   fill_url:"",
   companyName: "",

src/views/sellOut/filing/cpns/baseForm.vue

@@ -59,6 +59,15 @@
               @searchChange="supplierNosearchChange"
             />
           </el-form-item>
+          <el-form-item label="项目经理" prop="manager">
+            <project-manager
+              size="mini"
+              :isDetail="true"
+              :value="ruleForm.manager"
+              @searchChange="managerChange"
+            />
+          </el-form-item>
+
           <el-form-item label="附件" prop="fill_url">
             <div v-if="ruleForm.fill_url" class="clearfix">
               <a :href="ruleForm.fill_url" download="凭证文件">点击下载</a>
@@ -768,6 +777,10 @@ export default {
       }
       return isJPG && isLt2M;
     },
+    managerChange(e) {
+      const { id } = e;
+      this.ruleForm.manager = id ? [id] : [];
+    },
     //图片悬浮删除
     closeImg(index, key) {
       this.ruleForm[key].splice(index, 1);

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

@@ -27,6 +27,20 @@
             :columns="ShowDataTableColumns"
           />
         </el-col>
+
+        <el-col span="24" style="margin-top:20px">
+          <div style="display:flex;align-items:center">
+            <span style="color:red">*</span>
+            <p style="width:80px">项目经理:</p>
+            <project-manager
+              size="mini"
+              :isDetail="true"
+              :value="ruleForm.manager"
+              @searchChange="managerChange"
+            />
+          </div>
+        </el-col>
+
         <el-col :span="24" style="padding: 10px 0 0 0">
           <span style="line-height: 30px">商品下单：</span>
 
@@ -46,16 +60,16 @@
               class="fr"
               :size="'mini'"
               style="height: 29px"
-              >商品共{{ index + 1 }}/{{ total }}</el-button
-            >
+            >商品共{{ index + 1 }}/{{ total }}</el-button>
             <el-button
               v-if="total !== 0"
               type="primary"
               class="fr"
               :size="'mini'"
               @click="next_goods()"
-              ><i class="el-icon-arrow-right el-icon--right" :size="'mini'"
-            /></el-button>
+            >
+              <i class="el-icon-arrow-right el-icon--right" :size="'mini'" />
+            </el-button>
           </el-button-group>
           <project-manager
             :size="'mini'"
@@ -67,19 +81,8 @@
           />
         </el-col>
         <el-col :span="24">
-          <el-table
-            :data="order_good"
-            border
-            :size="'mini'"
-            style="width: 100%"
-            row-key="key"
-          >
-            <el-table-column
-              prop="good_img"
-              label="商品图片"
-              min-width="242px"
-              show-overflow-tooltip
-            >
+          <el-table :data="order_good" border :size="'mini'" style="width: 100%" row-key="key">
+            <el-table-column prop="good_img" label="商品图片" min-width="242px" show-overflow-tooltip>
               <template slot-scope="scope">
                 <div v-if="scope.row.good_img && scope.row.good_img.length > 0">
                   <img
@@ -94,44 +97,25 @@
                       height: 20px;
                       margin: 0 2px 0 0;
                     "
-                    alt=""
+                    alt
                   />
                 </div>
               </template>
             </el-table-column>
-            <el-table-column
-              prop="good_name"
-              label="商品名称"
-              show-overflow-tooltip
-              min-width="120"
-            >
+            <el-table-column prop="good_name" label="商品名称" show-overflow-tooltip min-width="120">
               <template slot-scope="scope">
                 <span>{{ scope.row.good_name }}</span>
-                <span v-for="(si, sii) in scope.row.specinfo" :key="si.id + sii">
-                  {{ sii === 0 ? "_" : "-" }}{{ si.spec_name }}[{{ si.spec_value_name }}]
-                </span>
+                <span
+                  v-for="(si, sii) in scope.row.specinfo"
+                  :key="si.id + sii"
+                >{{ sii === 0 ? "_" : "-" }}{{ si.spec_name }}[{{ si.spec_value_name }}]</span>
               </template>
             </el-table-column>
 
-            <el-table-column
-              prop="brand_name"
-              label="品牌"
-              width="110"
-              show-overflow-tooltip
-            />
-            <el-table-column
-              prop="sale_price"
-              label="单价"
-              width="110"
-              show-overflow-tooltip
-            />
+            <el-table-column prop="brand_name" label="品牌" width="110" show-overflow-tooltip />
+            <el-table-column prop="sale_price" label="单价" width="110" show-overflow-tooltip />
             <el-table-column prop="num" label="数量" width="100" show-overflow-tooltip />
-            <el-table-column
-              prop="sendtype"
-              label="下单方式"
-              width="150"
-              show-overflow-tooltip
-            >
+            <el-table-column prop="sendtype" label="下单方式" width="150" show-overflow-tooltip>
               <template slot-scope="scope">
                 <el-select
                   v-model="scope.row.sendtype"
@@ -151,6 +135,7 @@
             </el-table-column>
           </el-table>
         </el-col>
+
         <el-col v-if="sendtype + '' === '1'" :span="24" style="padding: 15px 0 0 0">
           <el-form ref="addrForm" :model="addrForm" :size="'mini'">
             <el-table
@@ -186,12 +171,7 @@
                 </template>
               </el-table-column>
 
-              <el-table-column
-                prop="contactor"
-                label="收件联系人"
-                min-width="110"
-                show-overflow-tooltip
-              >
+              <el-table-column prop="contactor" label="收件联系人" min-width="110" show-overflow-tooltip>
                 <template slot-scope="scope">
                   <el-form-item
                     v-if="scope.row.edit"
@@ -210,12 +190,7 @@
                 </template>
               </el-table-column>
 
-              <el-table-column
-                prop="mobile"
-                label="收货联系电话"
-                min-width="130"
-                show-overflow-tooltip
-              >
+              <el-table-column prop="mobile" label="收货联系电话" min-width="130" show-overflow-tooltip>
                 <template slot-scope="scope">
                   <el-form-item
                     v-if="scope.row.edit"
@@ -234,12 +209,7 @@
                 </template>
               </el-table-column>
 
-              <el-table-column
-                prop="addr_code"
-                label="收货省市区"
-                min-width="230"
-                show-overflow-tooltip
-              >
+              <el-table-column prop="addr_code" label="收货省市区" min-width="230" show-overflow-tooltip>
                 <template slot-scope="scope">
                   <el-form-item
                     v-if="scope.row.edit"
@@ -262,12 +232,7 @@
                   <span v-if="!scope.row.edit">{{ scope.row.addr_code_name }}</span>
                 </template>
               </el-table-column>
-              <el-table-column
-                prop="addr"
-                label="详细地址"
-                min-width="170"
-                show-overflow-tooltip
-              >
+              <el-table-column prop="addr" label="详细地址" min-width="170" show-overflow-tooltip>
                 <template slot-scope="scope">
                   <el-form-item
                     v-if="scope.row.edit"
@@ -276,11 +241,7 @@
                     :size="'mini'"
                     :style="{ marginBottom: scope.row.edit ? '13px' : '0' }"
                   >
-                    <el-input
-                      v-model="scope.row.addr"
-                      :disabled="!scope.row.edit"
-                      maxlength="100"
-                    />
+                    <el-input v-model="scope.row.addr" :disabled="!scope.row.edit" maxlength="100" />
                   </el-form-item>
                   <span v-if="!scope.row.edit">{{ scope.row.addr }}</span>
                 </template>
@@ -322,36 +283,17 @@
                     placement="top"
                   >
                     <a class="downloadAddr" href="./static/收货地址模板.xlsx">
-                      <i
-                        class="el-icon-download tb-icon"
-                        style="color: #6954f0; margin: 0"
-                      />
+                      <i class="el-icon-download tb-icon" style="color: #6954f0; margin: 0" />
                     </a>
                   </el-tooltip>
                 </template>
                 <template slot-scope="scope">
-                  <el-tooltip
-                    v-if="!scope.row.edit"
-                    effect="dark"
-                    content="编辑"
-                    placement="top"
-                  >
-                    <i
-                      class="el-icon-edit tb-icon"
-                      @click="openHouseModal(scope.$index)"
-                    />
+                  <el-tooltip v-if="!scope.row.edit" effect="dark" content="编辑" placement="top">
+                    <i class="el-icon-edit tb-icon" @click="openHouseModal(scope.$index)" />
                   </el-tooltip>
 
-                  <el-tooltip
-                    v-if="scope.row.edit"
-                    effect="dark"
-                    content="保存"
-                    placement="top"
-                  >
-                    <i
-                      class="el-icon-circle-check tb-icon"
-                      @click="checkRow(scope.$index)"
-                    />
+                  <el-tooltip v-if="scope.row.edit" effect="dark" content="保存" placement="top">
+                    <i class="el-icon-circle-check tb-icon" @click="checkRow(scope.$index)" />
                   </el-tooltip>
 
                   <el-tooltip effect="dark" content="删除" placement="top">
@@ -387,7 +329,7 @@ import {
   isEmoticon,
   isSpecialSymbol,
   hasSpace,
-  isAddr,
+  isAddr
 } from "@/utils/validate";
 import inAddrModel from "@/components/in-addr-model";
 import { ShowDataTableColumns } from "./ShowDataTableColumns";
@@ -463,69 +405,72 @@ export default {
       planNo: "",
       arrtime: "",
       project_list: [],
+      ruleForm: {
+        manager: ""
+      },
       options: [
         {
           value: "1",
-          label: "有地址下单",
+          label: "有地址下单"
         },
         {
           value: "2",
-          label: "无地址下单",
-        },
+          label: "无地址下单"
+        }
       ],
       index: 0,
       total: 0,
       order_good: [],
       sendtype: "1",
       addrForm: {
-        order_addr: [], // 收货地址
+        order_addr: [] // 收货地址
       },
       addrRules: {
         receipt_quantity: [
           {
             required: true,
             validator: validateWeight,
-            trigger: "blur",
-          },
+            trigger: "blur"
+          }
         ],
 
         contactor: [
           {
             required: true,
             trigger: "blur",
-            validator: validatecontactor,
-          },
+            validator: validatecontactor
+          }
         ],
         mobile: [
           {
             required: true,
             validator: validatemobile,
-            trigger: "blur",
-          },
+            trigger: "blur"
+          }
         ],
 
         addr_code: [
           {
             type: "array",
             required: false,
-            trigger: "change",
-          },
+            trigger: "change"
+          }
         ],
         addr: [
           {
             required: true,
             validator: validateAddr,
-            trigger: "blur",
-          },
-        ],
+            trigger: "blur"
+          }
+        ]
       },
 
       loading: false,
-      id: "",
+      id: ""
     };
   },
   watch: {
-    showModel: function (val) {
+    showModel: function(val) {
       this.showModelThis = val;
       if (val) {
         this.initForm();
@@ -535,7 +480,7 @@ export default {
       if (!val) {
         this.$emit("cancel");
       }
-    },
+    }
   },
   methods: {
     closeModel() {
@@ -556,12 +501,12 @@ export default {
       this.arrtime = in_arrival_time || "";
       const goods = JSON.parse(JSON.stringify(feedback));
       if (goods && goods.length > 0) {
-        goods.forEach((e) => {
+        goods.forEach(e => {
           e.sendtype = "1";
           const model = JSON.parse(JSON.stringify(e));
           const item = {
             order_good: [model],
-            order_addr: [],
+            order_addr: []
           };
           this.project_list.push(item);
         });
@@ -575,7 +520,7 @@ export default {
     },
     addrRefresh(e) {
       const list = JSON.parse(JSON.stringify(e.list));
-      list.forEach((item) => {
+      list.forEach(item => {
         item.label = [item.label];
         item.code = [item.areaCode];
       });
@@ -594,7 +539,7 @@ export default {
         return;
       }
       let isedit = false;
-      order_addr.forEach((e) => {
+      order_addr.forEach(e => {
         ta += e.receipt_quantity * 1;
         if (e.edit) {
           isedit = true;
@@ -643,7 +588,8 @@ export default {
           this.$refs.addrForm.clearValidate();
         }
         const list1 = this.project_list[index].order_good;
-        this.order_good = list1.length > 0 ? JSON.parse(JSON.stringify(list1)) : [];
+        this.order_good =
+          list1.length > 0 ? JSON.parse(JSON.stringify(list1)) : [];
 
         this.order_good[0].good_img = this.order_good[0].good_img.split(",");
         const list2 = this.project_list[index].order_addr;
@@ -653,7 +599,7 @@ export default {
       });
     },
     openHouseModal(index) {
-      const findex = this.addrForm.order_addr.findIndex((v) => v.edit === true);
+      const findex = this.addrForm.order_addr.findIndex(v => v.edit === true);
       if (findex !== -1) {
         this.$message.warning("当前已有地址在编辑，请保存后再试！");
         return;
@@ -667,7 +613,7 @@ export default {
             addr_code: [],
             addr: "",
             code: [],
-            label: [],
+            label: []
           });
         } else {
           this.addrForm.order_addr[index].edit = true;
@@ -695,7 +641,7 @@ export default {
         const arrCode = addr_code[addr_code.length - 1];
         // console.log(model);
         const { code, data, message } = await asyncRequest.addrall({
-          code: arrCode,
+          code: arrCode
         });
         if (code === 0) {
           const { province, city, area } = data;
@@ -717,7 +663,7 @@ export default {
     },
     // 省市区保存某一行
     checkRow(rowIndex) {
-      this.$refs.addrForm.validate((valid) => {
+      this.$refs.addrForm.validate(valid => {
         if (valid) {
           this.addrForm.order_addr[rowIndex].edit = false;
         } else {
@@ -738,32 +684,32 @@ export default {
       const model = {
         planNo: this.planNo,
         arrtime: this.arrtime,
-        manager:this.manager[0],
-        planinfo: [],
+        manager: this.manager[0],
+        planinfo: []
       };
-      this.project_list.forEach((e) => {
+      this.project_list.forEach(e => {
         const { order_good, order_addr } = e;
 
         const { id, sendtype } = JSON.parse(JSON.stringify(order_good[0]));
         const modelA = {
           feedback_id: id || "",
           sendtype: sendtype || "2",
-          addrlist: [],
+          addrlist: []
         };
-        order_addr.forEach((a) => {
+        order_addr.forEach(a => {
           const modelB = {
             addr_code: a.addr_code.toString(),
             contactor: a.contactor,
             mobile: a.mobile,
             addr: a.addr,
-            receipt_quantity: a.receipt_quantity,
+            receipt_quantity: a.receipt_quantity
           };
           modelA.addrlist.push(modelB);
         });
         model.planinfo.push(modelA);
       });
 
-      Object.keys(model).forEach((key) => {
+      Object.keys(model).forEach(key => {
         if (typeof model[key] === "string") {
           model[key] = replaceTextWrapAndSpace(model[key]);
         }
@@ -774,7 +720,7 @@ export default {
       if (res && res.code === 0) {
         this.$notify.success({
           title: "下单成功！",
-          message: "",
+          message: ""
         });
         this.showModelThis = false;
         // 刷新
@@ -784,8 +730,8 @@ export default {
       } else {
         this.$message.warning(res.message);
       }
-    },
-  },
+    }
+  }
 };
 </script>
 

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

@@ -5,19 +5,9 @@
       <div class="project-setPlan-ask-table">
         <template v-if="ladder">
           <el-table :data="ladder" :size="'mini'" border stripe style="width: 100%">
-            <el-table-column
-              label="要求编码"
-              prop="pgNo"
-              width="155px"
-              show-overflow-tooltip
-            />
+            <el-table-column label="要求编码" prop="pgNo" width="155px" show-overflow-tooltip />
 
-            <el-table-column
-              prop="good_type"
-              label="商品类型"
-              width="80px"
-              show-overflow-tooltip
-            >
+            <el-table-column prop="good_type" label="商品类型" width="80px" show-overflow-tooltip>
               <template slot-scope="scope">
                 <el-tag
                   :size="'mini'"
@@ -27,28 +17,13 @@
                       {}
                     ).label || '--'
                   "
-                ></el-tag
-              ></template>
+                ></el-tag>
+              </template>
             </el-table-column>
-            <el-table-column
-              prop="budget_price"
-              label="预算单价"
-              width="110"
-              show-overflow-tooltip
-            />
-            <el-table-column
-              prop="num"
-              label="购买数量"
-              width="110"
-              show-overflow-tooltip
-            />
+            <el-table-column prop="budget_price" label="预算单价" width="110" show-overflow-tooltip />
+            <el-table-column prop="num" label="购买数量" width="110" show-overflow-tooltip />
             <el-table-column prop="cat_name" label="商品分类" show-overflow-tooltip />
-            <el-table-column
-              prop="good_img"
-              label="图片"
-              width="50"
-              show-overflow-tooltip
-            >
+            <el-table-column prop="good_img" label="图片" width="50" show-overflow-tooltip>
               <template slot-scope="scope">
                 <div
                   v-if="scope.row.good_img"
@@ -59,7 +34,7 @@
                   <img
                     :src="scope.row.good_img"
                     style="display: inline-block; width: 100%; height: 100%"
-                    alt=""
+                    alt
                   />
                 </div>
               </template>
@@ -79,32 +54,11 @@
           style="width: 100%"
           @selection-change="handleSelectionChange"
         >
-          <el-table-column type="selection" width="40" v-if="table_type === 'add'">
-          </el-table-column>
-          <el-table-column
-            prop="pgNo"
-            label="要求编码"
-            width="155px"
-            show-overflow-tooltip
-          />
-          <el-table-column
-            prop="sale_price"
-            label="销售单价"
-            width="110"
-            show-overflow-tooltip
-          />
-          <el-table-column
-            prop="num"
-            label="购买数量"
-            width="110"
-            show-overflow-tooltip
-          />
-          <el-table-column
-            prop="good_img"
-            label="商品图片"
-            min-width="168px"
-            show-overflow-tooltip
-          >
+          <el-table-column type="selection" width="40" v-if="table_type === 'add'"></el-table-column>
+          <el-table-column prop="pgNo" label="要求编码" width="155px" show-overflow-tooltip />
+          <el-table-column prop="sale_price" label="销售单价" width="110" show-overflow-tooltip />
+          <el-table-column prop="num" label="购买数量" width="110" show-overflow-tooltip />
+          <el-table-column prop="good_img" label="商品图片" min-width="168px" show-overflow-tooltip>
             <template slot-scope="scope">
               <div v-if="scope.row.good_img && scope.row.good_img.length > 0">
                 <img
@@ -118,59 +72,34 @@
                     height: 20px;
                     margin: 0 2px 0 0;
                   "
-                  alt=""
+                  alt
                   v-viewer
                 />
               </div>
             </template>
           </el-table-column>
-          <el-table-column
-            prop="good_name"
-            label="商品名称"
-            min-width="120"
-            show-overflow-tooltip
-          >
+          <el-table-column prop="good_name" label="商品名称" min-width="120" show-overflow-tooltip>
             <template slot-scope="scope">
               <span>{{ scope.row.good_name }}</span>
-              <span v-for="(si, sii) in scope.row.specinfo" :key="si.id + sii">
-                {{ sii === 0 ? "_" : "-" }}{{ si.spec_name }}[{{ si.spec_value_name }}]
-              </span>
+              <span
+                v-for="(si, sii) in scope.row.specinfo"
+                :key="si.id + sii"
+              >{{ sii === 0 ? "_" : "-" }}{{ si.spec_name }}[{{ si.spec_value_name }}]</span>
             </template>
           </el-table-column>
-          <el-table-column
-            prop="data_source"
-            label="商品类型"
-            width="85"
-            show-overflow-tooltip
-          >
+          <el-table-column prop="data_source" label="商品类型" width="85" show-overflow-tooltip>
             <template slot-scope="scope">
               <el-tag
                 :size="'mini'"
                 :type="scope.row.data_source + '' === '1' ? 'success' : ''"
-                >{{ scope.row.data_source + '' === "1" ? "平台商品" : "采反商品" }}</el-tag
-              >
+              >{{ scope.row.data_source + '' === "1" ? "平台商品" : "采反商品" }}</el-tag>
             </template>
           </el-table-column>
 
           <el-table-column prop="class_cat" label="商品分类" show-overflow-tooltip />
-          <el-table-column
-            prop="expire_day"
-            label="信息有效期"
-            width="85"
-            show-overflow-tooltip
-          />
-          <el-table-column
-            prop="work_day"
-            label="制作工期"
-            width="70"
-            show-overflow-tooltip
-          />
-          <el-table-column
-            prop="delivery_day"
-            label="物流时间"
-            width="70"
-            show-overflow-tooltip
-          />
+          <el-table-column prop="expire_day" label="信息有效期" width="85" show-overflow-tooltip />
+          <el-table-column prop="work_day" label="制作工期" width="70" show-overflow-tooltip />
+          <el-table-column prop="delivery_day" label="物流时间" width="70" show-overflow-tooltip />
         </el-table>
       </div>
       <div class="project-setPlan-title">
@@ -178,10 +107,11 @@
         <span
           style="margin: 0 0 0 50px; font-size: 13px; color: #e4393c"
           v-if="total !== 0 && table_type === 'list'"
-          >{{ plan_show.status + '' === "1" ? "已选定" : "" }}方案总金额：{{
-            plan_show.sale_total
-          }}元</span
         >
+          {{ plan_show.status + '' === "1" ? "已选定" : "" }}方案总金额：{{
+          plan_show.sale_total
+          }}元
+        </span>
         <el-button-group
           :size="'mini'"
           class="fr"
@@ -195,15 +125,16 @@
             @click="add_plan"
             icon="el-icon-circle-plus-outline"
             :size="'mini'"
-            >添加方案
-          </el-button>
+          >添加方案</el-button>
           <el-button
             type="primary"
             class="fr"
             v-if=" (plan_show.status + '' === '1' && ppowers.some((i) => i == '5') && status == '5') && !isSupertube"
             @click="place_order"
             :size="'mini'"
-            >项目下单<i class="el-icon-shopping-cart-2 el-icon--right"></i>
+          >
+            项目下单
+            <i class="el-icon-shopping-cart-2 el-icon--right"></i>
           </el-button>
           <el-button
             class="fr"
@@ -220,8 +151,7 @@
             v-if="total !== 0"
             :size="'mini'"
             style="height: 29px"
-            >方案共{{ index + 1 }}/{{ total }}</el-button
-          >
+          >方案共{{ index + 1 }}/{{ total }}</el-button>
           <el-button
             type="primary"
             class="fr"
@@ -229,8 +159,9 @@
             v-if="total !== 0"
             @click="index++, change_plan()"
             :size="'mini'"
-            ><i class="el-icon-arrow-right el-icon--right" :size="'mini'"></i
-          ></el-button>
+          >
+            <i class="el-icon-arrow-right el-icon--right" :size="'mini'"></i>
+          </el-button>
         </el-button-group>
         <el-button-group
           :size="'mini'"
@@ -244,10 +175,10 @@
             :size="'mini'"
             icon="el-icon-arrow-left"
             @click="back_list"
-            >返回列表</el-button
-          >
-          <el-button type="primary" class="fr" @click="save_plan" :size="'mini'"
-            >保存方案<i class="el-icon-upload el-icon--right"></i>
+          >返回列表</el-button>
+          <el-button type="primary" class="fr" @click="save_plan" :size="'mini'">
+            保存方案
+            <i class="el-icon-upload el-icon--right"></i>
           </el-button>
         </el-button-group>
       </div>
@@ -260,12 +191,7 @@
           :ref="'multipleTable' + index"
           style="width: 100%"
         >
-          <el-table-column
-            prop="pgNo"
-            label="要求编码"
-            width="155px"
-            show-overflow-tooltip
-          />
+          <el-table-column prop="pgNo" label="要求编码" width="155px" show-overflow-tooltip />
           <el-table-column
             prop="origin_sale_price"
             label="系统售价单价"
@@ -273,12 +199,7 @@
             show-overflow-tooltip
           />
 
-          <el-table-column
-            prop="new_sale_price"
-            label="当前销售单价"
-            width="110"
-            show-overflow-tooltip
-          >
+          <el-table-column prop="new_sale_price" label="当前销售单价" width="110" show-overflow-tooltip>
             <template slot-scope="scope">
               <div v-if="table_type === 'add'">
                 <digital-input
@@ -300,12 +221,7 @@
               <span v-else>{{ scope.row.new_sale_price || scope.row.sale_price }}元</span>
             </template>
           </el-table-column>
-          <el-table-column
-            prop="origin_num"
-            label="竞价数量"
-            width="110"
-            show-overflow-tooltip
-          />
+          <el-table-column prop="origin_num" label="竞价数量" width="110" show-overflow-tooltip />
           <el-table-column prop="num" label="购买数量" width="110" show-overflow-tooltip>
             <template slot-scope="scope">
               <div v-if="table_type === 'add'">
@@ -331,16 +247,10 @@
               <el-tag
                 :size="'mini'"
                 :type="scope.row.data_source + '' === '1' ? 'success' : ''"
-                >{{ scope.row.data_source + '' === "1" ? "平台商品" : "采反商品" }}</el-tag
-              >
+              >{{ scope.row.data_source + '' === "1" ? "平台商品" : "采反商品" }}</el-tag>
             </template>
           </el-table-column>
-          <el-table-column
-            prop="good_img"
-            label="商品图片"
-            min-width="242px"
-            show-overflow-tooltip
-          >
+          <el-table-column prop="good_img" label="商品图片" min-width="242px" show-overflow-tooltip>
             <template slot-scope="scope">
               <div v-if="scope.row.good_img && scope.row.good_img.length > 0">
                 <img
@@ -354,44 +264,22 @@
                     height: 20px;
                     margin: 0 2px 0 0;
                   "
-                  alt=""
+                  alt
                   v-viewer
                 />
               </div>
             </template>
           </el-table-column>
-          <el-table-column
-            prop="good_name"
-            label="商品名称"
-            min-width="120"
-            show-overflow-tooltip
-          >
+          <el-table-column prop="good_name" label="商品名称" min-width="120" show-overflow-tooltip>
             <template slot-scope="scope">
               <span>{{ scope.row.good_name }}</span>
-              <span v-for="(si, sii) in scope.row.specinfo" :key="si.id + sii">
-                {{ sii === 0 ? "_" : "-" }}{{ si.spec_name }}[{{ si.spec_value_name }}]
-              </span>
+              <span
+                v-for="(si, sii) in scope.row.specinfo"
+                :key="si.id + sii"
+              >{{ sii === 0 ? "_" : "-" }}{{ si.spec_name }}[{{ si.spec_value_name }}]</span>
             </template>
           </el-table-column>
           <el-table-column prop="class_cat" label="商品分类" show-overflow-tooltip />
-          <!-- <el-table-column
-            prop="expiry_day"
-            label="信息有效期"
-            width="85"
-            show-overflow-tooltip
-          />
-          <el-table-column
-            prop="work_day"
-            label="制作工期"
-            width="70"
-            show-overflow-tooltip
-          />
-          <el-table-column
-            prop="delivery_day"
-            label="物流时间"
-            width="70"
-            show-overflow-tooltip
-          /> -->
         </el-table>
       </div>
       <buy-good-modal
@@ -408,26 +296,26 @@ import asyncRequest from "@/apis/service/sellOut/project";
 import resToken from "@/mixins/resToken";
 import columnsForm from "./columnsForm";
 import buyGoodModal from "./buyGoodModal";
-import { mapGetters } from 'vuex'
+import { mapGetters } from "vuex";
 export default {
   name: "setPlan",
   props: ["showModel", "sitem", "id", "type", "newTime"],
   mixins: [resToken],
   components: { buyGoodModal },
   computed: {
-    ...mapGetters(['isSupertube']),
+    ...mapGetters(["isSupertube"]),
     powers() {
-      const { btnList } = this.$store.getters
-      const tran = btnList.find((i) => i.menu_route == "projectDetail") || {};
+      const { btnList } = this.$store.getters;
+      const tran = btnList.find(i => i.menu_route == "projectDetail") || {};
       const { action } = tran ?? {};
       return action ?? [];
     },
     ppowers() {
-      const { roleProcess } = this.$store.getters
-      const tran = roleProcess.find((i) => i.process_type === "PRO") || {};
+      const { roleProcess } = this.$store.getters;
+      const tran = roleProcess.find(i => i.process_type === "PRO") || {};
       const { action } = tran ?? {};
       return action ?? [];
-    },
+    }
   },
   watch: {
     // showModel: function (val) {
@@ -436,11 +324,11 @@ export default {
     //     this.initForm();
     //   }
     // },
-    newTime: function (val) {
+    newTime: function(val) {
       if (val) {
         this.initForm();
       }
-    },
+    }
   },
   data() {
     return {
@@ -459,11 +347,11 @@ export default {
       status: "",
       statusOptions: [
         { value: "1", label: "竞品" },
-        { value: "2", label: "竞聘" },
+        { value: "2", label: "竞聘" }
       ],
       table: {
         stripe: true,
-        border: true,
+        border: true
         // _defaultHeader_: ["setcol"],
       },
       // 表格 - 列参数
@@ -472,8 +360,8 @@ export default {
       multipleSelection: [],
       plan_show: {
         sale_total: "0",
-        feedback: [],
-      },
+        feedback: []
+      }
     };
   },
   mounted() {
@@ -489,9 +377,17 @@ export default {
     },
     //项目下单
     place_order() {
-      const { company, khName, platform_name, arrtime, project_name } = this.sitem;
+      const {
+        company,
+        khName,
+        platform_name,
+        arrtime,
+        project_name
+      } = this.sitem;
       // console.log("aaaaaaaaaaaaaaa",this.sitem)
-      this.bayGoodItem = JSON.parse(JSON.stringify(this.allPlanList[this.index]));
+      this.bayGoodItem = JSON.parse(
+        JSON.stringify(this.allPlanList[this.index])
+      );
       this.bayGoodItem.in_company = company;
       this.bayGoodItem.in_khname = khName;
       this.bayGoodItem.in_platform_name = platform_name;
@@ -503,7 +399,7 @@ export default {
       this.pageInfo = {
         size: 15,
         curr: 1,
-        total: 0,
+        total: 0
       };
       this.loading = true;
       this.tableData = [];
@@ -523,7 +419,7 @@ export default {
       this.table_type = "add";
       this.plan_show = {
         sale_total: "0",
-        feedback: [],
+        feedback: []
       };
     },
     moq_num_change(e, index, key, time) {
@@ -544,7 +440,7 @@ export default {
       this.pageInfo = {
         size: 100,
         curr: 1,
-        total: 0,
+        total: 0
       };
       this.tableData = [];
       await this.searchList();
@@ -554,14 +450,16 @@ export default {
       let list = JSON.parse(JSON.stringify(this.plan_show.feedback));
       this.plan_show = {
         sale_total: "0",
-        feedback: [],
+        feedback: []
       };
       this.multipleSelection.forEach((a, i) => {
         a.origin_sale_price = a.sale_price;
         a.new_sale_price = a.sale_price;
         console.log(a.origin_sale_price, a.sale_price);
 
-        let fi = list.findIndex((b) => a.id + '' === b.id + '' && b.pgNo === a.pgNo);
+        let fi = list.findIndex(
+          b => a.id + "" === b.id + "" && b.pgNo === a.pgNo
+        );
         if (fi !== -1) {
           this.plan_show.feedback.push(JSON.parse(JSON.stringify(list[fi])));
         } else {
@@ -571,8 +469,7 @@ export default {
         }
       });
 
-
-      this.plan_show.feedback.map((e) => {
+      this.plan_show.feedback.map(e => {
         e.origin_num = e.num;
         e.time_price = "";
         e.time_num = "";
@@ -581,7 +478,7 @@ export default {
 
       // this.$nextTick(() => this.$forceUpdate())
 
-      console.log(this.plan_show)
+      console.log(this.plan_show);
 
       setTimeout(() => {
         // this.plan_show.feedback.forEach((a, index) => {
@@ -603,13 +500,13 @@ export default {
         bidNo: "",
         status: "1",
         pgNo: "",
-        projectNo: this.projectNo,
+        projectNo: this.projectNo
       };
       const { code, data } = await asyncRequest.back_good_list(model);
       if (code === 0) {
         const { list, count } = data;
         this.tableData = list;
-        this.tableData.map((v) => {
+        this.tableData.map(v => {
           v.class_cat = "";
           if (v.can && v.can.length > 0) {
             v.can.forEach((x, i) => {
@@ -639,8 +536,8 @@ export default {
         const { feedback } = this.plan_show;
         let list = feedback;
         let isok = true;
-        list.forEach((a) => {
-          let findex = list.findIndex((b) => b.pgNo === a.pgNo && a.id !== b.id);
+        list.forEach(a => {
+          let findex = list.findIndex(b => b.pgNo === a.pgNo && a.id !== b.id);
           if (findex !== -1) {
             isok = false;
           }
@@ -650,9 +547,9 @@ export default {
           return;
         }
         let isall = true;
-        this.ladder.forEach((a) => {
+        this.ladder.forEach(a => {
           let to = 0;
-          list.forEach((b) => {
+          list.forEach(b => {
             if (a.pgNo === b.pgNo) {
               to++;
             }
@@ -668,18 +565,20 @@ export default {
         this.loading = true;
         let model = {
           feedback: [],
-          projectNo: this.projectNo,
+          projectNo: this.projectNo
         };
 
-        list.forEach((e) => {
+        list.forEach(e => {
           let si = {
             feedid: e.id,
             sale_price: e.new_sale_price,
-            good_num: e.num,
+            good_num: e.num
           };
           model.feedback.push(si);
         });
-        const { code, data, message } = await asyncRequest.project_make_plan(model);
+        const { code, data, message } = await asyncRequest.project_make_plan(
+          model
+        );
         if (code === 0) {
           await this.back_list();
         } else if (code >= 100 && code <= 104) {
@@ -693,9 +592,11 @@ export default {
     //获取全部方案
     async get_plan(type) {
       let model = {
-        projectNo: this.projectNo,
+        projectNo: this.projectNo
       };
-      const { code, data, message } = await asyncRequest.get_project_plan(model);
+      const { code, data, message } = await asyncRequest.get_project_plan(
+        model
+      );
       if (code === 0) {
         this.allPlanList = JSON.parse(JSON.stringify(data));
         this.total = this.allPlanList.length;
@@ -714,14 +615,14 @@ export default {
       this.plan_show = {
         sale_total: "0",
         status: "0",
-        feedback: [],
+        feedback: []
       };
       if (type) {
         this.index = 0;
       }
-      if (this.status + '' === "4") {
+      if (this.status + "" === "4") {
         this.allPlanList.forEach((a, ai) => {
-          if (a.status + '' === "1") {
+          if (a.status + "" === "1") {
             this.index = ai;
           }
         });
@@ -732,9 +633,9 @@ export default {
       this.plan_show = {
         sale_total: sale_total,
         status: status,
-        feedback: JSON.parse(JSON.stringify(feedback)),
+        feedback: JSON.parse(JSON.stringify(feedback))
       };
-      this.plan_show.feedback.map((v) => {
+      this.plan_show.feedback.map(v => {
         v.class_cat = "";
         if (v.cat_info && v.cat_info.length > 0) {
           v.cat_info.forEach((x, i) => {
@@ -754,8 +655,8 @@ export default {
       for (let i = 0; i < this.plan_show.feedback.length; i++) {
         this.$set(this.plan_show.feedback, i, this.plan_show.feedback[i]);
       }
-    },
-  },
+    }
+  }
 };
 </script>
 

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

@@ -75,6 +75,7 @@
                 <el-input v-model="ruleForm.workNo" placeholder="如：业管单号" maxlength="100" />
               </el-form-item>
             </el-col>
+
             <el-col :span="12">
               <el-form-item
                 :label="ruleForm.good_code === '' ? '销售商品' : ''"
@@ -162,6 +163,18 @@
                 </show-data-table>
               </el-form-item>
             </el-col>
+
+            <el-col :span="12">
+              <el-form-item label="项目经理">
+                <project-manager
+                  size="mini"
+                  :isDetail="true"
+                  :value="ruleForm.manager"
+                  @searchChange="managerChange"
+                />
+              </el-form-item>
+            </el-col>
+
             <el-col :span="12" v-show="ruleForm.good_code">
               <el-row>
                 <el-col :span="12">
@@ -745,7 +758,8 @@ export default {
         workNo: "", //其他单号
         sendtype: "1", //发货方式
         remark: "", //备注
-        good_code: "" // 商品编号
+        good_code: "", // 商品编号
+        manager: []
       },
       rulesThis: this.rules,
       rules: {
@@ -880,6 +894,11 @@ export default {
     this.initForm();
   },
   methods: {
+    managerChange(e) {
+      const { id } = e;
+      this.ruleForm.manager = id ? [id] : [];
+      // this.ruleForm.manager_name = label ?? "";
+    },
     priceAccMul(a, b) {
       return accMul(a, b);
     },
@@ -902,6 +921,7 @@ export default {
           this.$refs.ruleForm.clearValidate();
 
           this.ruleForm = {
+            manager: [],
             order_type: "1",
             supplierNo: this.currentCompany || "", //销售方编码
             customer_code: [], // 企业客户选择

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

@@ -28,16 +28,16 @@
             <template slot="good_name">
               <span>{{ sitem.good_name }}</span>
               <span v-for="(si, sii) in sitem.specinfo" :key="si.specid + sii">
-                <span v-if="sii !== 0">--</span
-                ><span>{{ si.spec_name }}[{{ si.spec_value_name }}]</span></span
-              >
+                <span v-if="sii !== 0">--</span>
+                <span>{{ si.spec_name }}[{{ si.spec_value_name }}]</span>
+              </span>
             </template>
             <template slot="is_noble">
               <span v-if="sitem.is_noble">
                 {{ sitem.noble_weight }}g--{{ sitem.metal_name }}--{{
-                  sitem.is_diff === "1" ? "有" : "无"
-                }}工差--{{ sitem.config }}--{{ sitem.other_config }}</span
-              >
+                sitem.is_diff === "1" ? "有" : "无"
+                }}工差--{{ sitem.config }}--{{ sitem.other_config }}
+              </span>
               <span v-else>非贵金属商品</span>
             </template>
             <template slot="in_num">
@@ -93,21 +93,12 @@
               </el-col>
               <el-col :span="6">
                 <el-form-item label="总金额" prop="good_num" label-width="70px">
-                  <el-input
-                    v-model="total_price"
-                    placeholder="总金额"
-                    disabled
-                    maxlength="500"
-                  />
+                  <el-input v-model="total_price" placeholder="总金额" disabled maxlength="500" />
                 </el-form-item>
               </el-col>
               <el-col :span="5">
                 <el-form-item label="下单方式" prop="sendtype" label-width="90px">
-                  <el-select
-                    v-model="ruleForm.sendtype"
-                    placeholder="下单方式"
-                    style="width: 100%"
-                  >
+                  <el-select v-model="ruleForm.sendtype" placeholder="下单方式" style="width: 100%">
                     <el-option
                       v-for="item in options"
                       :key="item.value"
@@ -118,13 +109,7 @@
                 </el-form-item>
               </el-col>
               <el-col :span="2" style="text-align: right">
-                <el-button
-                  :size="'mini'"
-                  type="primary"
-                  :disabled="loading"
-                  @click="submitForm"
-                  >保 存
-                </el-button>
+                <el-button :size="'mini'" type="primary" :disabled="loading" @click="submitForm">保 存</el-button>
               </el-col>
               <el-col :span="11">
                 <el-form-item label="业务公司" prop="companyNo" label-width="85px">
@@ -140,22 +125,14 @@
               </el-col>
               <el-col :span="13">
                 <el-form-item label="订单备注" prop="remark" label-width="85px">
-                  <el-input
-                    v-model="ruleForm.remark"
-                    maxlength="500"
-                    placeholder="订单备注"
-                  />
+                  <el-input v-model="ruleForm.remark" maxlength="500" placeholder="订单备注" />
                 </el-form-item>
               </el-col>
 
               <el-col :span="12">
                 <el-row>
                   <el-form-item label-width="85px" label="商品类型" prop="goodtype">
-                    <el-select
-                      v-model="ruleForm.goodtype"
-                      style="width: 100%"
-                      placeholder="商品类型"
-                    >
+                    <el-select v-model="ruleForm.goodtype" style="width: 100%" placeholder="商品类型">
                       <el-option
                         v-for="goodType in goodTypes"
                         :key="goodType.value"
@@ -209,8 +186,7 @@
                             <el-popover placement="top" width="300" trigger="hover">
                               <video width="275" controls class="fl">
                                 <source :src="video_url" type="video/mp4" />
-                                <source :src="video_url" type="video/avi" />
-                                您的浏览器不支持Video标签。
+                                <source :src="video_url" type="video/avi" />您的浏览器不支持Video标签。
                               </video>
                               <i
                                 slot="reference"
@@ -223,8 +199,7 @@
                               type="warning"
                               style="margin: 0 0 0 16px"
                               @click="deleteUrl('1')"
-                              >删除</el-link
-                            >
+                            >删除</el-link>
                           </div>
 
                           <div v-else class="activity-upload">
@@ -249,18 +224,13 @@
                         </li>
                         <li v-if="ruleForm.proof_type + '' === '2'" class="tupian">
                           <div v-if="img_url" class="clearfix">
-                            <img
-                              style="width: 50px; height: 50px"
-                              :src="img_url"
-                              class="avatar fl"
-                            />
+                            <img style="width: 50px; height: 50px" :src="img_url" class="avatar fl" />
                             <el-link
                               :underline="false"
                               type="warning"
                               style="margin: 0 0 0 16px"
                               @click="deleteUrl('2')"
-                              >删除</el-link
-                            >
+                            >删除</el-link>
                           </div>
 
                           <div v-else class="activity-upload">
@@ -291,8 +261,7 @@
                               type="warning"
                               style="margin: 0 0 0 16px"
                               @click="deleteUrl('3')"
-                              >删除</el-link
-                            >
+                            >删除</el-link>
                           </div>
 
                           <div v-else class="activity-upload">
@@ -329,11 +298,7 @@
                   />
                 </el-form-item>
 
-                <el-form-item
-                  label="平台订单号"
-                  prop="platform_order"
-                  label-width="115px"
-                >
+                <el-form-item label="平台订单号" prop="platform_order" label-width="115px">
                   <el-input
                     v-model="ruleForm.platform_order"
                     maxlength="2000"
@@ -354,7 +319,7 @@
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="12"> </el-col>
+              <el-col :span="12"></el-col>
             </el-row>
           </el-form>
         </el-col>
@@ -394,12 +359,7 @@
                 </template>
               </el-table-column>
 
-              <el-table-column
-                prop="contactor"
-                label="收件联系人"
-                min-width="110"
-                show-overflow-tooltip
-              >
+              <el-table-column prop="contactor" label="收件联系人" min-width="110" show-overflow-tooltip>
                 <template slot-scope="scope">
                   <el-form-item
                     v-if="scope.row.edit"
@@ -419,12 +379,7 @@
                 </template>
               </el-table-column>
 
-              <el-table-column
-                prop="mobile"
-                label="收货联系电话"
-                min-width="130"
-                show-overflow-tooltip
-              >
+              <el-table-column prop="mobile" label="收货联系电话" min-width="130" show-overflow-tooltip>
                 <template slot-scope="scope">
                   <el-form-item
                     v-if="scope.row.edit"
@@ -444,12 +399,7 @@
                 </template>
               </el-table-column>
 
-              <el-table-column
-                prop="addr_code"
-                label="收货省市区"
-                min-width="230"
-                show-overflow-tooltip
-              >
+              <el-table-column prop="addr_code" label="收货省市区" min-width="230" show-overflow-tooltip>
                 <template slot-scope="scope">
                   <el-form-item
                     v-if="scope.row.edit"
@@ -472,12 +422,7 @@
                   <span v-if="!scope.row.edit">{{ scope.row.addr_code_name }}</span>
                 </template>
               </el-table-column>
-              <el-table-column
-                prop="addr"
-                label="详细地址"
-                min-width="170"
-                show-overflow-tooltip
-              >
+              <el-table-column prop="addr" label="详细地址" min-width="170" show-overflow-tooltip>
                 <template slot-scope="scope">
                   <el-form-item
                     v-if="scope.row.edit"
@@ -533,36 +478,17 @@
                     placement="top"
                   >
                     <a class="downloadAddr" href="./static/收货地址模板.xlsx">
-                      <i
-                        class="el-icon-download tb-icon"
-                        style="color: #6954f0; margin: 0"
-                      />
+                      <i class="el-icon-download tb-icon" style="color: #6954f0; margin: 0" />
                     </a>
                   </el-tooltip>
                 </template>
                 <template slot-scope="scope">
-                  <el-tooltip
-                    v-if="!scope.row.edit"
-                    effect="dark"
-                    content="编辑"
-                    placement="top"
-                  >
-                    <i
-                      class="el-icon-edit tb-icon"
-                      @click="openHouseModal(scope.$index)"
-                    />
+                  <el-tooltip v-if="!scope.row.edit" effect="dark" content="编辑" placement="top">
+                    <i class="el-icon-edit tb-icon" @click="openHouseModal(scope.$index)" />
                   </el-tooltip>
 
-                  <el-tooltip
-                    v-if="scope.row.edit"
-                    effect="dark"
-                    content="保存"
-                    placement="top"
-                  >
-                    <i
-                      class="el-icon-circle-check tb-icon"
-                      @click="checkRow(scope.$index)"
-                    />
+                  <el-tooltip v-if="scope.row.edit" effect="dark" content="保存" placement="top">
+                    <i class="el-icon-circle-check tb-icon" @click="checkRow(scope.$index)" />
                   </el-tooltip>
                   <el-tooltip effect="dark" content="删除" placement="top">
                     <i
@@ -597,7 +523,7 @@ import {
   isEmoticon,
   isSpecialSymbol,
   hasSpace,
-  isAddr,
+  isAddr
 } from "@/utils/validate";
 import inAddrModel from "@/components/in-addr-model";
 import { ShowDataTableColumns } from "./ShowDataTableColumns";
@@ -693,37 +619,39 @@ export default {
       goodTypes: [
         { value: "1", label: "常规商品" },
         { value: "2", label: "赠品" },
-        { value: "3", label: "样品" },
+        { value: "3", label: "样品" }
       ],
       proof_options: [
         {
           value: "1",
-          label: "视频",
+          label: "视频"
         },
         {
           value: "2",
-          label: "图片",
+          label: "图片"
         },
         {
           value: "3",
-          label: "其他",
-        },
+          label: "其他"
+        }
       ],
       pickerOptions: {
-        disabledDate: (time) => {
-          return time.getTime() < new Date(this.sitem.in_arrival_time).getTime();
-        },
+        disabledDate: time => {
+          return (
+            time.getTime() < new Date(this.sitem.in_arrival_time).getTime()
+          );
+        }
       },
 
       options: [
         {
           value: "1",
-          label: "有地址下单",
+          label: "有地址下单"
         },
         {
           value: "2",
-          label: "无地址下单",
-        },
+          label: "无地址下单"
+        }
       ],
       stock_code: "",
       cat_id: "",
@@ -737,7 +665,7 @@ export default {
         platform_order: "", // 平台订单号
         workNo: "", // 其他单号
         companyNo: "",
-        manager: [],
+        manager: []
       },
       manager_name: "",
       rulesThis: this.rules,
@@ -746,121 +674,121 @@ export default {
           {
             required: true,
             trigger: "change",
-            message: "请选择商品类型",
-          },
+            message: "请选择商品类型"
+          }
         ],
         good_num: [
           {
             required: true,
             validator: validate_num_0,
-            trigger: "blur",
-          },
+            trigger: "blur"
+          }
         ],
         sale_price: [
           {
             required: true,
             validator: validate_num_0,
-            trigger: "blur",
-          },
+            trigger: "blur"
+          }
         ],
         manager: [
           {
             required: true,
             message: "请选择项目经理",
-            trigger: "change",
-          },
+            trigger: "change"
+          }
         ],
         companyNo: [
           {
             required: true,
             message: "请选择业务公司",
-            trigger: "change",
-          },
+            trigger: "change"
+          }
         ],
         sendtype: [
           {
             required: true,
             message: "请选择发货方式",
-            trigger: "change",
-          },
+            trigger: "change"
+          }
         ],
         remark: [
           {
             required: true,
             message: "输入订单备注",
-            trigger: "blur",
-          },
+            trigger: "blur"
+          }
         ],
         arrtime: [
           {
             required: true,
             message: "要求到货时间",
-            trigger: "change",
-          },
+            trigger: "change"
+          }
         ],
         proof_type: [
           {
             required: false,
             message: "请选择凭证类型",
-            trigger: "change",
-          },
+            trigger: "change"
+          }
         ],
         proof_url: [
           {
             required: false,
             message: "请上传凭证文件",
-            trigger: "blur,change",
-          },
-        ],
+            trigger: "blur,change"
+          }
+        ]
       },
       addrForm: {
-        order_addr: [], // 收货地址
+        order_addr: [] // 收货地址
       },
       addrRules: {
         receipt_quantity: [
           {
             required: true,
             validator: validateWeight,
-            trigger: "blur",
-          },
+            trigger: "blur"
+          }
         ],
 
         contactor: [
           {
             required: true,
             trigger: "blur",
-            validator: validatecontactor,
-          },
+            validator: validatecontactor
+          }
         ],
         mobile: [
           {
             required: true,
             validator: validatemobile,
-            trigger: "blur",
-          },
+            trigger: "blur"
+          }
         ],
 
         addr_code: [
           {
             type: "array",
             required: false,
-            trigger: "change",
-          },
+            trigger: "change"
+          }
         ],
         addr: [
           {
             required: true,
             validator: validateAddr,
-            trigger: "blur",
-          },
-        ],
+            trigger: "blur"
+          }
+        ]
       },
 
-      id: "",
+      id: ""
     };
   },
   watch: {
-    showModel: function (val) {
+    showModel: function(val) {
       this.showModelThis = val;
       if (val) {
         // this.rulesThis = this.rules;
@@ -873,12 +801,8 @@ export default {
       }
     },
     "ruleForm.sale_price"(val) {
-      // console.log(val)
       this.ruleForm.goodtype = Number(val) === 0 ? "2" : "1";
-    },
-  },
-  created() {
-    // this.this.ruleForm.arrtime = this.sitem.in_arrival_time.substring(0, 10);
+    }
   },
   methods: {
     managerChange(e) {
@@ -941,7 +865,7 @@ export default {
     },
     addrRefresh(e) {
       const list = JSON.parse(JSON.stringify(e.list));
-      list.forEach((item) => {
+      list.forEach(item => {
         item.label = [item.label];
         item.code = [item.areaCode];
       });
@@ -963,7 +887,7 @@ export default {
             in_arrival_time,
             sale_price,
             remark,
-            in_companyNo,
+            in_companyNo
           } = this.sitem;
           console.log(this.sitem);
           this.ruleForm = {
@@ -977,7 +901,7 @@ export default {
             proof_url: "", // 驳回至
             companyNo: in_companyNo || "",
             goodtype: Number(sale_price) === 0 ? "2" : "1",
-            manager: [],
+            manager: []
           };
         }
 
@@ -985,13 +909,13 @@ export default {
           this.$refs.addrForm.resetFields();
           this.$refs.addrForm.clearValidate();
           this.addrForm = {
-            order_addr: [],
+            order_addr: []
           };
         }
       });
     },
     openHouseModal(index) {
-      const findex = this.addrForm.order_addr.findIndex((v) => v.edit === true);
+      const findex = this.addrForm.order_addr.findIndex(v => v.edit === true);
       if (findex !== -1) {
         this.$message.warning("当前已有地址在编辑，请保存后再试！");
         return;
@@ -1005,7 +929,7 @@ export default {
             addr_code: [],
             addr: "",
             code: [],
-            label: [],
+            label: []
           });
         } else {
           this.addrForm.order_addr[index].edit = true;
@@ -1053,7 +977,7 @@ export default {
     // },
     // 省市区保存某一行
     checkRow(rowIndex) {
-      this.$refs.addrForm.validate((valid) => {
+      this.$refs.addrForm.validate(valid => {
         if (valid) {
           this.addrForm.order_addr[rowIndex].edit = false;
         } else {
@@ -1067,14 +991,14 @@ export default {
       rows.splice(index, 1);
     },
     async submitForm() {
-      await this.$refs.ruleForm.validate(async (valid) => {
+      await this.$refs.ruleForm.validate(async valid => {
         if (valid) {
           if (this.loading) return;
           this.loading = true;
           const model = JSON.parse(JSON.stringify(this.ruleForm));
 
           model.order_addr = [];
-          const { sendtype, good_num,manager } = model;
+          const { sendtype, good_num, manager } = model;
           const { order_addr } = JSON.parse(JSON.stringify(this.addrForm));
           if (sendtype + "" === "1" && order_addr && order_addr.length === 0) {
             this.$message.warning("至少上传一个地址信息！");
@@ -1084,7 +1008,7 @@ export default {
           if (sendtype + "" === "1") {
             let addrT = 0;
             let isAEdit = false;
-            order_addr.forEach((v2) => {
+            order_addr.forEach(v2 => {
               if (v2.edit) {
                 isAEdit = true;
               }
@@ -1094,7 +1018,7 @@ export default {
                 contactor: v2.contactor,
                 mobile: v2.mobile,
                 addr: v2.addr,
-                receipt_quantity: v2.receipt_quantity,
+                receipt_quantity: v2.receipt_quantity
               };
               model.order_addr.push(model2);
             });
@@ -1112,7 +1036,7 @@ export default {
           }
 
           // 去除上送字段空格&换行
-          Object.keys(model).forEach((key) => {
+          Object.keys(model).forEach(key => {
             if (typeof model[key] === "string" && key !== "arrtime") {
               model[key] = replaceTextWrapAndSpace(model[key]);
             }
@@ -1124,7 +1048,7 @@ export default {
           if (res && res.code === 0) {
             this.$notify.success({
               title: "下单成功！",
-              message: "",
+              message: ""
             });
             this.showModelThis = false;
             // 刷新
@@ -1300,8 +1224,8 @@ export default {
           this.ruleForm.proof_url = this.video_url;
       }
       this.$refs.ruleForm.validateField("proof_url");
-    },
-  },
+    }
+  }
 };
 </script>
 

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

@@ -33,7 +33,7 @@
             alt=""
           />
         </div>
-      </template> -->
+      </template>-->
       <template #status="{ scope }">
         <el-tag
           :size="tablebtnSize"
@@ -48,8 +48,9 @@
       </template>
       <template #specinfo="{ scope }">
         <span v-for="(si, sii) in scope.row.specinfo" :key="si.specid + sii">
-          <span v-if="sii !== 0"></span>{{ si.spec_name }}[{{ si.spec_value_name }}]</span
-        >
+          <span v-if="sii !== 0"></span>
+          {{ si.spec_name }}[{{ si.spec_value_name }}]
+        </span>
       </template>
 
       <template #operation="{ scope }">
@@ -105,7 +106,7 @@
           placement="top"
         >
           <i class="el-icon-s-check tb-icon" @click="change_goods(scope.row.bidNo)"></i>
-        </el-tooltip> -->
+        </el-tooltip>-->
         <el-tooltip
           v-if="
             is_project === '0' &&
@@ -158,7 +159,7 @@
       >
         <li style="line-height: 20px; padding: 0 0 16px 0">
           驳回节点：{{
-            (baoptions.find((it) => it.id == item.status) || {}).label || "--"
+          (baoptions.find((it) => it.id == item.status) || {}).label || "--"
           }}
         </li>
         <li>驳回理由：{{ item.remark }}</li>
@@ -182,34 +183,36 @@ export default {
   components: {
     addEditBargain,
     buyGoodModal,
-    showGoodsDataTableModal,
+    showGoodsDataTableModal
   },
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
       const tran =
         this.$store.getters.btnList.find(
-          (item) => item.menu_route == "zixunOrderDetail"
+          item => item.menu_route == "zixunOrderDetail"
         ) || {};
       const { action } = tran ?? {};
       return action ?? [];
     },
     ppowers() {
       const tran =
-        this.$store.getters.roleProcess.find((item) => item.process_type === "ZXD") || {};
+        this.$store.getters.roleProcess.find(
+          item => item.process_type === "ZXD"
+        ) || {};
       const { action } = tran ?? {};
       return action ?? [];
-    },
+    }
   },
   watch: {
-    newTime: function (val) {
+    newTime: function(val) {
       if (val) {
         const { is_project, status } = this.sitem;
         this.is_project = is_project;
         this.status = status;
         this.searchList();
       }
-    },
+    }
   },
   data() {
     return {
@@ -239,7 +242,7 @@ export default {
         { id: "9", label: "boss通过", type: "success" },
         { id: "10", label: "boss越线通过", type: "" },
         { id: "11", label: "boss驳回", type: "danger" },
-        { id: "12", label: "取消议价", type: "info" }, //已选完商品，取消议价
+        { id: "12", label: "取消议价", type: "info" } //已选完商品，取消议价
       ],
       options: [
         { id: "0", label: "待发布竞标" },
@@ -249,7 +252,7 @@ export default {
         { id: "4", label: "已选商品待下单" },
         { id: "5", label: "已成功转单" },
         { id: "6", label: "已取消转单" },
-        { id: "7", label: "招标已暂停" },
+        { id: "7", label: "招标已暂停" }
       ],
       sitem: null,
       // 状态
@@ -260,7 +263,7 @@ export default {
         { id: "3", label: "等待议价结果", type: "warning" },
         { id: "4", label: "等待议价结果", type: "warning" },
         { id: "5", label: "议价已结束", type: "" },
-        { id: "6", label: "已选择该商品", type: "success" },
+        { id: "6", label: "已选择该商品", type: "success" }
         // 0待提交1待任务结束 2 待竞价确认 3议价待财务定价4 待主管确认5 待竞价确认定价6 竞价确认
       ],
       loading: true,
@@ -275,23 +278,23 @@ export default {
         bidNo: "",
         projectNo: "",
         page: 1, // 页码
-        size: 15, // 每页显示条数
+        size: 15 // 每页显示条数
       },
       // 表格 - 数据
       tableData: [],
       // 表格 - 参数
       table: {
         stripe: true,
-        border: true,
+        border: true
       },
       // 表格 - 分页
       pageInfo: {
         size: 15,
         curr: 1,
-        total: 0,
+        total: 0
       },
       // 表格 - 列参数
-      columns: feedbackListCol,
+      columns: feedbackListCol
     };
   },
   mounted() {
@@ -314,13 +317,13 @@ export default {
         bidNo: "",
         projectNo: "",
         page: 1, // 页码
-        size: 15, // 每页显示条数
+        size: 15 // 每页显示条数
       };
       // 表格 - 分页
       this.pageInfo = {
         size: 15,
         curr: 1,
-        total: 0,
+        total: 0
       };
       this.searchList();
     },
@@ -361,19 +364,19 @@ export default {
       await this.$confirm("确定要选择该商品下单?", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
-        type: "warning",
+        type: "warning"
       })
         .then(async () => {
           this.loading = true;
           const model = {
-            bidNo: bidNo,
+            bidNo: bidNo
           };
           const res = await asyncRequest.bidscheck(model);
           if (res && res.code === 0) {
             this.loading = false;
             this.$notify.success({
               title: "选择商品成功！",
-              message: "",
+              message: ""
             });
             this.$emit("resGoodOk");
           } else if (res && res.code >= 100 && res.code <= 104) {
@@ -391,20 +394,20 @@ export default {
       await this.$confirm("确定要改为" + str + "?", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
-        type: "warning",
+        type: "warning"
       })
         .then(async () => {
           this.loading = true;
           const model = {
             id: id,
-            status: status + "" === "1" ? "0" : "1",
+            status: status + "" === "1" ? "0" : "1"
           };
           const res = await asyncRequest.status(model);
           if (res && res.code === 0) {
             this.loading = false;
             this.$notify.success({
               title: "状态修改成功！",
-              message: "",
+              message: ""
             });
             await this.searchList();
           } else if (res && res.code >= 100 && res.code <= 104) {
@@ -418,7 +421,14 @@ export default {
         });
     },
     buy_goods(row) {
-      const { company, companyNo, khname, platform_name, arrival_time, num } = this.sitem;
+      const {
+        company,
+        companyNo,
+        khname,
+        platform_name,
+        arrival_time,
+        num
+      } = this.sitem;
       this.bayGoodItem = JSON.parse(JSON.stringify(row));
       this.bayGoodItem.in_company = company;
       this.bayGoodItem.in_companyNo = companyNo;
@@ -453,8 +463,8 @@ export default {
       this.pageInfo.curr = 1;
       this.parmValue.page = 1;
       await this.searchList();
-    },
-  },
+    }
+  }
 };
 </script>
 <style lang="scss" scoped>

src/views/supplierSellOut/supplierFiling/config/columns.js

@@ -740,6 +740,13 @@ const validate_good_name = (rule, value, callback) => {
   }
 };
 const rules = {
+  manager:[
+    {
+      required:true,
+      message:'请选择项目经理',
+      trigger:'change'
+    }
+  ],
   fill_url:[
     {
       required: true,
@@ -1118,6 +1125,7 @@ const other_ruleForm = {
 };
 
 const ruleForm1 = {
+  manager:[],
   customerName:"",
   fill_url:"",
   companyName: "",

src/views/supplierSellOut/supplierFiling/config/rules.js

@@ -94,6 +94,11 @@ export const addressRules = {
 }
 
 export const createRules = {
+  manager:{
+    reuqired:true,
+    message:'请选择项目经理',
+    trigger:'chanage'
+  },
   customerCode: {
     required: true,
     message: '业务公司不能为空',

src/views/supplierSellOut/supplierFiling/cpns/baseForm.vue

@@ -58,6 +58,17 @@
               @searchChange="supplierNosearchChange"
             />
           </el-form-item>
+
+          <el-form-item label="项目经理" prop="manager">
+            <project-manager
+              size="mini"
+              :value="ruleForm.manager"
+              placeholder="项目经理"
+              @searchChange="managerChange"
+              style="width:100%"
+            />
+          </el-form-item>
+
           <el-form-item label="附件" prop="fill_url">
             <div v-if="ruleForm.fill_url" class="clearfix">
               <a :href="ruleForm.fill_url" download="凭证文件">点击下载</a>
@@ -251,11 +262,11 @@
               <el-form-item label="发货地" prop="delivery_place">
                 <search-area
                   :value="ruleForm.delivery_place"
+                  :disabled="type === 'view'"
                   :names="delivery_place_cn"
+                  :placeholder="'发货地'"
                   :is-detail="true"
-                  :disabled="type === 'view'"
                   size="mini"
-                  :placeholder="'发货地'"
                   :level="3"
                   @searchChange="selectAreadeliveryChange($event)"
                 />
@@ -273,9 +284,9 @@
                 >
                   <el-option
                     v-for="group in options6"
-                    :key="group.id"
                     :label="group.name"
                     :value="group.id"
+                    :key="group.id"
                   />
                 </el-select>
               </el-form-item>
@@ -720,6 +731,10 @@ export default {
     this.initForm();
   },
   methods: {
+    managerChange(e) {
+      const { id, label } = e;
+      this.ruleForm.manager = id ? [id] : [];
+    },
     // 其他文件上传成功
     async UploadSuccessOtherproof_url(data) {
       const { url } = data;