feat:添加字段

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

@@ -7,9 +7,14 @@
     :close-on-click-modal="false"
     @close="() => innerVisible = false"
   >
-    <div v-if="tableData && tableData.length > 0" class="tr" style="padding: 10px 0 0 0">
+    <div v-if="tableData && tableData.length > 0" class="tr" style="padding: 10px 0 0 0;display:flex">
       <!-- <el-button :size="'mini'" @click="() => tableData = []">取消</el-button>
       <el-button type="primary" :size="'mini'" @click="onSubmit">提交</el-button> -->
+
+      <project-manager size="mini" :is-detail="true" :names="manager" :value="managerid" @searchChange="manageridChange" />
+
+      <el-button type="warning" size="mini" style="margin-left:10px" @click="batchSetting">批量设置</el-button>
+      <el-button type="primary" size="mini">保存设置</el-button>
     </div>
     <div v-else>
       <upload-excel :on-success="onSuccess" :before-upload="beforeUpload" />
@@ -20,6 +25,7 @@
       :table="table"
       :data="tableData"
       style="margin: 15px 0 0 0"
+      @selection="handleSelection"
     />
   </el-dialog>
 </template>
@@ -49,6 +55,9 @@ export default {
   data() {
     return {
       columns,
+      manager: "",
+      managerid: "",
+      selected: [],
       loading: false,
       tableData: [],
       table: {
@@ -69,6 +78,24 @@ export default {
     }
   },
   methods: {
+    batchSetting(){
+      if(!this.manager || !this.managerid){
+        this.$message.warning("请选择业务经理!")
+        return
+      }
+
+      if(this.selected.length === 0){
+        this.$message.warning("请选择至少一条记录!")
+        return
+      }
+
+    },
+    handleSelection(data){
+      this.selected = data.list
+    },
+    manageridChange(data){
+      console.log(data)
+    },
     validateTableHeader(header, importHeader) {
       let isHeaderOk = true
 
@@ -175,6 +202,9 @@ export default {
       })
       this.validateFields(this.tableData).message()
     },
+    async manageridChange(data){
+      console.log(data);
+    },
     async onSubmit() {
       const { message, isFinalValid } = this.validateFields(this.tableData)
       if (!isFinalValid) return message()

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

@@ -64,11 +64,11 @@ export const createFieldVerification = (message) => ({
 
 export const requsetFields = [
   PROPERTYS.ORDER_CODE,
-  PROPERTYS.MANAGER,
+  PROPERTYS.IMPORT_MANAGER,
 ]
 export const requiredFields = [
   PROPERTYS.ORDER_CODE,
-  PROPERTYS.MANAGER
+  PROPERTYS.IMPORT_MANAGER
 ]
 
 export const numberFields = [
@@ -80,6 +80,8 @@ export const helper = {
     return Object.keys(sourceObject)
   },
   values(sourceObject, fields, index = 0) {
+    console.log(sourceObject)
+
     return fields.map(field => {
       return sourceObject[field][index]
     })

src/views/sellOut/returnTransferStock/columns.js

@@ -60,10 +60,15 @@ export default [
     width: '120px'
   },
   {
-    label: '关联采购单商品编号',
+    label: '关联采购单编号',
     width: '160px',
     _slot_: "cgdNo"
   },
+  {
+    label: '关联采购单商品编号',
+    width: '160px',
+    _slot_: "goodCode"
+  },
   {
     prop: 'order_source',
     label: '关联采购单商品名称',
@@ -77,6 +82,11 @@ export default [
     width: '130px',
     _slot_:"stockNum"
   },
+  {
+    prop: 'addtime',
+    label: '创建时间',
+    width: '160px'
+  },
   {
     prop: '',
     width: 160,

src/views/sellOut/returnTransferStock/index.vue

@@ -22,7 +22,7 @@ searchList();
               </el-col>
 
               <el-col :span="6" style="width: 240px; padding: 0 0 0 10px">
-                <el-input size="mini" v-model="parmValue.orderCode" placeholder="订单编号" @change="
+                <el-input size="mini" v-model="parmValue.orderCode" placeholder="退货销售编号" @change="
                   pageInfo.curr = 1;
                 parmValue.page = 1;
                 searchList();" />
@@ -95,6 +95,10 @@ searchList();
           {{ scope.row.purcheaseOrder ? scope.row.purcheaseOrder.cgdNo : '--' }}
         </template>
 
+        <template #goodCode="{ scope }">
+          {{ scope.row.purcheaseOrder ? scope.row.purcheaseOrder.spuCode : '--' }}
+        </template>
+
         <template #goodName="{ scope }">
           {{ scope.row.purcheaseOrder ? scope.row.purcheaseOrder.good_name : '--' }}
         </template>
@@ -134,7 +138,7 @@ searchList();
         </template>
       </ex-table>
 
-      <AssociationModal :id="recordId" :supplierNo="supplierNo" :showModel="centerDialogVisible" @refresh="searchList"
+      <AssociationModal :id="recordId" :showModel="centerDialogVisible" @refresh="searchList"
         @cancel="centerDialogVisible = false" />
     </div>
     <div v-else>
@@ -175,7 +179,6 @@ export default {
   },
   data() {
     return {
-      supplierNo:"",
       xs_order_type_options,
       xs_order_source_options,
       fileUrl: urlConfig.baseURL,
@@ -253,7 +256,6 @@ export default {
   methods: {
     handleAssociation(scope) {
       this.centerDialogVisible = true;
-      this.supplierNo = scope.row.supplierNo
       this.recordId = scope.row.id
     },
     companyNosearchChange({ code }) {