fix:锁定状态

src/apis/service/dataCorrection/managerBatchCorrection/index.js

@@ -6,6 +6,6 @@ export default {
   detail: (data, params) => http(api + 'managerinfo', data, 'post', params),
   add: (data, params) => http(api + 'manageradd', data, 'post', params),
   status: (data, params) => http(api + 'managerstatus', data, 'post', params),
-
-  import: (data, params) => http(api + 'managerexport', data, 'post', params)
+  import: (data, params) => http(api + 'managerexport', data, 'post', params),
+  users: (data, params) => http(api + 'user_role_list', data, 'post', params)
 }

src/views/dataCorrection/managerBatchCorrection/components/importTemplateModal.vue

@@ -8,8 +8,8 @@
     @close="() => innerVisible = false"
   >
     <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'" @click="onSubmit">提交</el-button>
+      <!-- <el-button :size="'mini'" @click="() => tableData = []">取消</el-button>
+      <el-button type="primary" :size="'mini'" @click="onSubmit">提交</el-button> -->
     </div>
     <div v-else>
       <upload-excel :on-success="onSuccess" :before-upload="beforeUpload" />
@@ -71,10 +71,13 @@ export default {
   methods: {
     validateTableHeader(header, importHeader) {
       let isHeaderOk = true
+
+      console.log(header, importHeader)
       if (header.length !== importHeader.length) return false
       for (const index in header) {
         const field = header[index]
         const importField = importHeader[index]
+
         if (field !== importField) {
           console.log(field, importField)
           isHeaderOk = false
@@ -150,10 +153,14 @@ export default {
       return tableItem
     },
     onSuccess({ results: templateItems, header: templateHeader }) {
+
+      const header = [columns[2].label,columns[3].label]
       const isHeaderValid = this.validateTableHeader(
-        this.columns.map(({ label }) => label).slice(1),
+        header,
         templateHeader
       )
+
+
       if (!isHeaderValid) {
         this.$message.warning('表格与导入的表头不一致!')
         return

src/views/dataCorrection/managerBatchCorrection/components/template.js

@@ -1,15 +1,13 @@
 
 const mapTemplateToTable = {
   '销售订单编号': 'orderCode',
-  '业务经理ID': 'managerid',
-  '业务经理名称': 'manager'
+  '导入业务经理名称': 'import_manager'
 }
 
 export const getTableProperty = (key) => mapTemplateToTable[key]
 export const PROPERTYS = {
   ORDER_CODE: getTableProperty('销售订单编号'),
-  MANAGER_ID: getTableProperty('业务经理ID'),
-  MANAGER: getTableProperty('业务经理名称')
+  IMPORT_MANAGER: getTableProperty('导入业务经理名称')
 }
 
 export const template = Array(1).fill(1).map(() => Object.keys(mapTemplateToTable).reduce((prev, property) => {
@@ -19,12 +17,12 @@ export const template = Array(1).fill(1).map(() => Object.keys(mapTemplateToTabl
 
 export const columns = [
   {
-    type: 'index',
-    label: '序号',
+    type: 'selection',
     width: '70px'
   },
   {
     type: 'index',
+    label: '序号',
     width: '70px'
   },
   {
@@ -33,13 +31,18 @@ export const columns = [
     required: true
   },
   {
-    prop: PROPERTYS.MANAGER_ID,
-    label: '业务经理ID',
+    prop: PROPERTYS.IMPORT_MANAGER,
+    label: '导入业务经理名称',
     required: true
   },
   {
     prop: PROPERTYS.MANAGER,
-    label: '业务经理名称',
+    label: '批量设置业务经理ID',
+    required: true
+  },
+  {
+    prop: PROPERTYS.MANAGER,
+    label: '批量设置业务经理名称',
     required: true
   }
 ]
@@ -48,12 +51,7 @@ export function createErrorMessage(messages) {
   const rows = Object.keys(messages)
   return rows.reduce((prev, row, index) => {
     const suffix = index === rows.length - 1 ? '</ul>' : ''
-
-    const content = prev + `
-      <li>
-        <strong style="font-weight:700">第${row}行</strong>,${messages[row]}
-      </li>
-    `
+    const content = prev + `<li><strong style="font-weight:700">第${row}行</strong>,${message[row]}</li>`
     return content + suffix
   }, '<ul>')
 }
@@ -70,7 +68,7 @@ export const requsetFields = [
 ]
 export const requiredFields = [
   PROPERTYS.ORDER_CODE,
-  PROPERTYS.MANAGER,
+  PROPERTYS.MANAGER
 ]
 
 export const numberFields = [

src/views/sellOut/returnTransferStock/component/association-modal.vue

@@ -18,7 +18,7 @@ searchList();
           <div style="width: 100%">
             <el-row style="padding: 0 0 0 80px">
               <el-col :span="4" style="width: 150px">
-                <el-select :size="searchSize" v-model="parmValue.status" filterable clearable placeholder="采购单状态"
+                <el-select :size="searchSize" v-model="parmValue.status" filterable clearable placeholder="采购单状态" disabled
                   style="width: 100%" @change="
                     pageInfo.curr = 1;
                   parmValue.page = 1;
@@ -157,7 +157,7 @@ export default {
         apply_name: "", // 申请人
         good_name: "", // 产品名称
         good_code: "", // 产品属性编号
-        status: "0", //状态
+        status: "3", //状态
         wsm_code: "", //入货仓库编码
         start: "", //新建起始时间
         end: "", // 新建结束时间
@@ -232,7 +232,7 @@ export default {
         apply_name: "", // 申请人
         good_name: "", // 产品名称
         good_code: "", // 产品属性编号
-        status: "", //状态
+        status: "3", //状态
         wsm_code: "", //入货仓库编码
         start: "", //新建起始时间
         end: "", // 新建结束时间