fix:数据修复

src/views/dataCorrection/vendorCorrection/components/correctionForm.vue

@@ -284,6 +284,8 @@ const VALID_OA_CODE = function(_1, _2, callback) {
       callback(new Error("OA编号必须为纯数字!"));
     } else if (oaCode.length !== 12) {
       callback(new Error("OA编号必须为12位!"));
+    }else{
+      callback()
     }
   }
 };
@@ -451,7 +453,7 @@ export default {
       try {
         await this.$refs.ruleForm.validate();
         const { supplierName, ...rest } = this.ruleForm;
-
+        console.log(111)
         const apply_name = this.activeOptions.find(
           ({ id }) => id === rest.uid[0]
         ).nickname;

src/views/netOrderEntry/prestoreRecordingOrders/addEdit.vue

@@ -772,6 +772,7 @@ export default {
       this.$refs.ruleForm.validateField("cat_id");
     },
     async submitForm() {
+      console.log(111)
       await this.$refs.ruleForm.validate(async valid => {
         if (valid) {
           if (this.loading) {

src/views/netOrderEntry/prestoreRecordingOrders/importTemplateModal.vue

@@ -7,18 +7,24 @@
     :close-on-click-modal="false"
     @close="innerVisible = false; tableData = []"
   >
-    <div style="margin-bottom:20px;display:flex;align-items:center">
+    <!-- <div style="margin-bottom:20px;display:flex;align-items:center">
       <span style="color:red">*</span>
       <p style="width:80px">项目经理:</p>
+
+    </div> -->
+
+    <div v-if="tableData && tableData.length > 0" class="tr" style="padding: 10px 0 0 0">
+
+    <el-form>
       <project-manager
         size="mini"
         :isDetail="true"
         :value="ruleForm.manager"
         @searchChange="managerChange"
       />
-    </div>
+      </el-form-item>
+    </el-form>
 
-    <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>

src/views/orderEntry/orderImport/index.vue

@@ -1,15 +1,10 @@
 <template>
   <div class="orderImport pagePadding" v-loading="loading">
-    <div style="margin-bottom:20px;display:flex;align-items:center">
+    <!-- <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> -->
 
     <div class="tr" style="padding: 10px 0 0 0" v-if="tableData && tableData.length > 0">
       <el-form
@@ -36,7 +31,18 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="16" class="tr">
+          <!-- <el-col :span="8">
+            <el-form-item label="项目经理" prop="managerid">
+              <project-manager
+        size="mini"
+        :isDetail="true"
+        :value="ruleForm.managerid"
+        @searchChange="managerChange"
+      />
+            </el-form-item>
+          </el-col> -->
+
+          <el-col :span="8" class="tr">
             <el-button
               type="primary"
               @click="submit"
@@ -68,6 +74,7 @@ export default {
   data() {
     return {
       ruleForm: {
+        managerid:[],
         manager: "",
         platform_id: ""
       },
@@ -92,7 +99,15 @@ export default {
             required: true,
             message: "请选择导入目标平台",
             trigger: "change"
-          }
+          },
+        ],
+        managerid:[
+          {
+            type: 'array',
+            required: true,
+            message: "请选择导入项目经理",
+            trigger: "change"
+          },
         ]
       },
       loading: false,
@@ -112,7 +127,9 @@ export default {
   methods: {
     managerChange(e) {
       const { id, label } = e;
-      this.ruleForm.manager = id ? [id] : [];
+      this.ruleForm.managerid = id ? [id] : [];
+      this.ruleForm.manager = label 
+      this.$refs.ruleForm.validateField("managerid")
     },
     async resetForm() {
       this.loading = false;
@@ -221,6 +238,11 @@ export default {
 
     //提交
     async submit() {
+      if(!this.ruleForm.managerid){
+        this.$message.warning('请选择项目经理');
+        return
+      }
+      
       await this.$refs.ruleForm.validate(async valid => {
         if (valid) {
           if (!this.loading) {
@@ -238,9 +260,13 @@ export default {
             let model = {
               list: list
             };
-            const { code, data, message } = await asyncRequest.orderimport(
-              model
-            );
+            
+            const { code, data, message } = await asyncRequest.orderimport({
+              ...model,
+              // manager:this.ruleForm.manager || "",
+              // managerid:Array.isArray(this.ruleForm.managerid) ? this.ruleForm.managerid[0] : this.ruleForm.managerid
+            });
+
             this.loading = false;
             if (code === 0) {
               this.$notify.success({

src/views/reportQuery/purchaseReport/components/table6.vue

@@ -194,7 +194,7 @@ export default {
         { id: '3', label: '待选择商品' },
         { id: '4', label: '已选商品待下单' },
         { id: '5', label: '已成功转单' },
-        { id: '6', label: '超时已关闭' },
+        { id: '6', label: '竞价单已失效' },
         { id: '7', label: '招标已暂停' }
       ],
       // 表格 - 数据集合

src/views/sellOut/zixunOrder/columns.js

@@ -660,7 +660,7 @@ const options = [
   { id: '3', label: '待业务下单' },
   // { id: "4", label: "已选商品待下单" },
   { id: '5', label: '已成功转单' },
-  { id: '6', label: '超时已关闭' },
+  { id: '6', label: '竞价单已失效' },
   { id: '7', label: '招标已暂停' }
 ]
 export { listCol, rules, edutRules, feedbackListCol, options }

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

@@ -63,6 +63,8 @@
             <project-manager
               size="mini"
               :value="ruleForm.managerid"
+              :names="ruleForm.manager"
+              :isDetail="true"
               placeholder="项目经理"
               @searchChange="manageridChange"
               style="width:100%"
@@ -1028,9 +1030,15 @@ export default {
 
           let res = {};
           if (this.type === "add") {
-            res = await asyncRequest.add(model);
+            res = await asyncRequest.add({
+              ...model,
+              managerid:Array.isArray(model.managerid) ? model.managerid[0] : model.managerid
+            });
           } else {
-            res = await asyncRequest.update(model);
+            res = await asyncRequest.update({
+              ...model,
+              managerid:Array.isArray(model.managerid) ? model.managerid[0] : model.managerid
+            });
           }
 
           const { code } = await this.useResHandle(res);
@@ -1174,15 +1182,21 @@ export default {
               noble_metal,
               config,
               gold_weight,
-              other_config
+              other_config,
+              manager,
+              managerid
             } = data;
 
+            console.log(manager, managerid, '___________')
+
             if (Number(gold_weight) !== 0) {
               this.is_noble = true;
             }
 
             this.ruleForm = {
               ...ruleForm1,
+              manager:manager || "",
+              managerid: managerid ? [managerid] : [],
               other_config: other_config || "",
               gold_weight: gold_weight || "",
               noble_metal: noble_metal || "",

src/views/supplierSellOut/supplierFiling/index.vue

@@ -191,7 +191,7 @@
       </template>
 
       <template #operation="{ scope }">
-        <el-tooltip effect="dark" content="详情" placement="top">
+        <el-tooltip effect="dark" coontent="详情" placement="top">
           <i
             class="el-icon-view tb-icon"
             @click="getRouter('/supplierSellOut/supplierFilingDetail', scope.row.id)"