fix:退货关联采购单修改

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

@@ -0,0 +1,11 @@
+import http from '@/apis/axios'
+const api = 'admin/'
+
+export default {
+  list: (data, params) => http(api + 'managerlist', data, 'post', params),
+  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)
+}

src/views/dataCorrection/managerBatchCorrection/columns.js

@@ -0,0 +1,55 @@
+const columns = [
+  {
+    prop: 'orderCode',
+    label: '销售单编号',
+    minWidth: '180',
+    _slot_: 'orderCode'
+  },
+  {
+    prop: 'companyNo',
+    label: '业务公司编号',
+    minWidth: '155'
+  },
+  {
+    prop: 'companyName',
+    label: '业务公司名称',
+    minWidth: '155'
+  },
+  {
+    prop: 'status',
+    label: '状态',
+    _slot_: 'status',
+    width: '90px'
+  },
+  {
+    label: '业务经理(修改后)',
+    prop: 'manager',
+    minWidth: '185'
+  },
+  {
+    prop: 'updatetime',
+    label: '修改时间',
+    minWidth: '145'
+  },
+
+  {
+    prop: 'apply_name',
+    minWidth: '150px',
+    label: '申请人'
+  },
+  {
+    prop: 'addtime',
+    minWidth: '150px',
+    label: '申请时间'
+  },
+  {
+    prop: '操作',
+    label: '操作',
+    width: '60px',
+    _slot_: 'operation'
+  }
+]
+
+export {
+  columns
+}

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

@@ -0,0 +1,203 @@
+<template>
+  <el-dialog
+    center
+    width="1024px"
+    title="导入业务经理修正"
+    :visible="innerVisible"
+    :close-on-click-modal="false"
+    @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>
+    </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"
+    />
+  </el-dialog>
+</template>
+
+<script>
+import asyncRequest from '@/apis/service/dataCorrection/managerBatchCorrection'
+import { isMobile, isPhone, isnumber } from '@/utils/validate'
+import companyHelper from '@/mixins/companyHelper'
+import { MessageBox } from 'element-ui'
+import dayjs from 'dayjs'
+
+import {
+  helper,
+  columns,
+  PROPERTYS,
+  getTableProperty,
+  createErrorMessage,
+  createFieldVerification,
+  requsetFields,
+  requiredFields,
+  numberFields
+} from './template'
+
+export default {
+  mixins: [companyHelper],
+  props: ['visible','companyNo'],
+  data() {
+    return {
+      columns,
+      loading: false,
+      tableData: [],
+      table: {
+        stripe: true,
+        border: true,
+        'max-height': '800px'
+      }
+    }
+  },
+  computed: {
+    innerVisible: {
+      get() {
+        return this.visible
+      },
+      set(newVal) {
+        this.$emit('update:visible', newVal)
+      }
+    }
+  },
+  methods: {
+    validateTableHeader(header, importHeader) {
+      let isHeaderOk = true
+      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
+          break
+        }
+      }
+
+      return isHeaderOk
+    },
+    /* 所属平台、商品分类、商品名称、单位、收货人、收货地址、PO编号不能为空 **/
+    validateRequiredField(requiredFields) {
+      const verification = createFieldVerification('销售订单编号、业务经理,不能为空!')
+      const fields = helper.fields(requiredFields)
+
+      requiredFields[fields[0]].forEach((_, index) => {
+        if (!helper.values(requiredFields, fields, index).every(value => value && String(value).trim() !== '')) {
+          verification.isValid = false
+          verification.notValidRows.push(index + 1)
+        }
+      })
+      return verification
+    },
+    /* 处理不合法的值,提示错误信息,并返回最终的验证状态 **/
+    handleNotValidFields(...validStates) {
+      const messages = {}
+      let isFinalValid = true
+
+      for (const validState of validStates) {
+        const { message, isValid, notValidRows } = validState
+        if (isValid) continue
+        isFinalValid = false
+
+        notValidRows.forEach(row => {
+          if (!messages[row]) messages[row] = []
+          messages[row].push(message)
+        })
+      }
+
+      return {
+        isFinalValid,
+        message: () => !isFinalValid && MessageBox({
+          type: 'warning',
+          title: '数据填写错误',
+          dangerouslyUseHTMLString: true,
+          message: createErrorMessage(messages),
+          customClass: 'error-message__wrapper'
+        })
+      }
+    },
+    /* 校验导入的数据 **/
+    validateFields(tableData = []) {
+      const mapTableFieldToTableData = {}
+      for (const tableItem of tableData) {
+        const propertys = Object.keys(tableItem)
+        for (const property of propertys) {
+          const value = tableItem[property]
+          if (!mapTableFieldToTableData[property]) mapTableFieldToTableData[property] = []
+          mapTableFieldToTableData[property].push(value)
+        }
+      }
+
+      return this.handleNotValidFields(
+        this.validateRequiredField(helper.write(mapTableFieldToTableData, requiredFields))
+      )
+    },
+    mapTemplateItemToTableItem(templateItem) {
+      const tableItem = {}
+      const templatePropertys = Object.keys(templateItem)
+      templatePropertys.forEach(templateProperty => {
+        const tableproperty = getTableProperty(templateProperty)
+        tableItem[tableproperty] = templateItem[templateProperty]
+      })
+      return tableItem
+    },
+    onSuccess({ results: templateItems, header: templateHeader }) {
+      const isHeaderValid = this.validateTableHeader(
+        this.columns.map(({ label }) => label).slice(1),
+        templateHeader
+      )
+      if (!isHeaderValid) {
+        this.$message.warning('表格与导入的表头不一致!')
+        return
+      }
+      if (templateItems.length === 0) {
+        this.$message.warning('导入的表格没有数据!')
+        return
+      }
+      templateItems.forEach(templateItem => {
+        const tableItem = this.mapTemplateItemToTableItem(templateItem)
+        this.tableData.push(tableItem)
+      })
+      this.validateFields(this.tableData).message()
+    },
+    async onSubmit() {
+      const { message, isFinalValid } = this.validateFields(this.tableData)
+      if (!isFinalValid) return message()
+
+      const list = this.tableData.map(tableItem => requsetFields.reduce((prev, currentKey) => ({
+        ...prev,
+        [currentKey]: currentKey === PROPERTYS.SEND_TIME ? dayjs(tableItem[currentKey] * 1000).format('YYYY-MM-DD HH:mm:ss') : tableItem[currentKey]
+      }), {}))
+
+      this.loading = true
+      const result = await asyncRequest.import({ companyNo:this.companyNo, list })
+      this.loading = false
+
+      switch (String(result.code)) {
+        case '0':
+          this.$message.success('导入成功')
+          this.innerVisible = false
+          this.$emit('refresh')
+          break
+        default:
+          this.$message.warning(result.message)
+          break
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+.error-message__wrapper{
+  width: 1024px;
+}
+</style>

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

@@ -0,0 +1,86 @@
+
+const mapTemplateToTable = {
+  '销售订单编号': 'orderCode',
+  '业务经理': 'manager'
+}
+
+export const getTableProperty = (key) => mapTemplateToTable[key]
+
+export const PROPERTYS = {
+  ORDER_CODE: getTableProperty('销售订单编号'),
+  ORDER_CODE: getTableProperty('业务经理ID'),
+  MANAGER: getTableProperty('业务经理名称')
+}
+
+export const template = Array(1).fill(1).map(() => Object.keys(mapTemplateToTable).reduce((prev, property) => {
+  prev[property] = ''
+  return prev
+}, {}))
+
+export const columns = [
+  {
+    type: 'index',
+    label: '序号',
+    width: '70px'
+  },
+  {
+    prop: PROPERTYS.ORDER_CODE,
+    label: '销售订单编号',
+    required: true
+  },
+  {
+    prop: PROPERTYS.MANAGER,
+    label: '业务经理',
+    required: true
+  }
+]
+
+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>
+    `
+    return content + suffix
+  }, '<ul>')
+}
+
+export const createFieldVerification = (message) => ({
+  notValidRows: [],
+  isValid: true,
+  message
+})
+
+export const requsetFields = [
+  PROPERTYS.ORDER_CODE,
+  PROPERTYS.MANAGER,
+]
+export const requiredFields = [
+  PROPERTYS.ORDER_CODE,
+  PROPERTYS.MANAGER,
+]
+
+export const numberFields = [
+
+]
+
+export const helper = {
+  fields(sourceObject) {
+    return Object.keys(sourceObject)
+  },
+  values(sourceObject, fields, index = 0) {
+    return fields.map(field => {
+      return sourceObject[field][index]
+    })
+  },
+  write(sourceObject, fields) {
+    return fields.reduce((prev, currentKey) => ({
+      ...prev,
+      [currentKey]: sourceObject[currentKey]
+    }), {})
+  }
+}

src/views/dataCorrection/managerBatchCorrection/index.vue

@@ -0,0 +1,304 @@
+<template>
+  <div class="pagePadding">
+    <div class="box" v-if="powers.some((i) => i == '001')">
+      <ex-table
+        v-loading="loading"
+        :table="table"
+        :data="tableData"
+        :columns="columns"
+        :page="pageInfo"
+        :size="size"
+        @page-curr-change="handlePageChange"
+        @page-size-change="handleSizeChange"
+        @screen-reset="
+          pageInfo.curr = 1;
+          parmValue.page = 1;
+          searchList();
+        "
+        @screen-submit="
+          pageInfo.curr = 1;
+          parmValue.page = 1;
+          searchList();
+        "
+      >
+        <template #table-header="{}">
+          <div style="width: 100%;">
+            <el-row style="padding-left: 80px">
+              <el-col :span="5" style="width: 230px; float: left;">
+                <el-input
+                  v-model="parmValue.orderCode"
+                  :size="'mini'"
+                  style="width: 100%"
+                  placeholder="订单编号"
+                  @blur="
+                    pageInfo.curr = 1;
+                    parmValue.page = 1;
+                    searchList();
+                  "
+                />
+              </el-col>
+
+              <el-col :span="5" style="width: 230px; float: left;margin-left:10px">
+                <el-input
+                  v-model="parmValue.apply_name"
+                  :size="'mini'"
+                  placeholder="申请人"
+                  @blur="
+                    pageInfo.curr = 1;
+                    parmValue.page = 1;
+                    searchList();
+                  "
+                />
+              </el-col>
+
+              <el-col :span="5" style="margin-left: 10px">
+                <el-select
+                  size="mini"
+                  v-model="parmValue.status"
+                  placeholder="状态"
+                  clearable
+                  @change="
+                    pageInfo.curr = 1;
+                    parmValue.page = 1;
+                    searchList();
+                  "
+                >
+                  <el-option
+                    v-for="opt in statusOptions"
+                    :key="opt.value"
+                    :label="opt.label"
+                    :value="opt.value"
+                  />
+                </el-select>
+              </el-col>
+
+              <el-col :span="3" style="width: 66px; float: right">
+                <el-button
+                  type="primary"
+                  :size="searchSize"
+                  style="float: right"
+                  @click="searchList"
+                >刷新</el-button>
+              </el-col>
+
+              <el-col :span="3" style="width: 66px; float: right">
+                <el-button
+                  type="warning"
+                  :size="searchSize"
+                  style="float: right"
+                  @click="restSearch"
+                >重置</el-button>
+              </el-col>
+
+              <el-col
+                :span="3"
+                class="fr"
+                style="width: 66px; padding: 0 0 0 10px"
+              >
+                <el-button
+                  :size="searchSize"
+                  type="success"
+                  style="float: right"
+                  @click="onImport"
+                >导入</el-button>
+              </el-col>
+
+              <el-col
+                :span="3"
+                class="fr"
+                style="width: 66px; padding: 0 0 0 10px"
+              >
+                <el-button
+                  :size="searchSize"
+                  type="primary"
+                  style="float: right"
+                  @click="onDownloadTemplate"
+                >下载导入模板</el-button>
+              </el-col>
+            </el-row>
+          </div>
+        </template>
+
+        <template #status="{scope}">
+          <el-tag
+            :size="'mini'"
+            :type="scope.row.status == '1' ? 'warning' : ''"
+            v-text="
+            (statusOptions.find((i)=> i.value == scope.row.status) || {})
+              .label || '--'
+          "
+          ></el-tag>
+        </template>
+
+        <template #orderCode="{scope}">
+          {{ Object.keys(scope.row.orderCode).map(key => scope.row.orderCode[key]).join(" , ") }}
+        </template>
+
+        <template #before="{scope}">
+          <el-tooltip :content="'客户公司编码 : ' + scope.row.before.customer_code" placement="top">
+            <i class="el-icon-warning-outline" style="margin-right:2px;cursor:pointer" />
+          </el-tooltip>
+          {{scope.row.before.customerName}}
+        </template>
+
+        <template #after="{scope}">
+          <el-tooltip :content="'客户公司编码 : ' + scope.row.after.customer_code" placement="top">
+            <i class="el-icon-warning-outline" style="margin-right:2px;cursor:pointer" />
+          </el-tooltip>
+          {{scope.row.after.customerName}}
+        </template>
+        <!--  -->
+        <template #operation="{ scope }">
+          <el-tooltip effect="dark" content="详情" placement="top" v-if="powers.some((i) => i == '007')">
+            <i
+              class="el-icon-view tb-icon"
+              @click="routeGoto('managerCorrectionDetail', {
+                id: scope.row.id,
+                mode: 'update'
+              })"
+            ></i>
+          </el-tooltip>
+        </template>
+      </ex-table>
+    </div>
+
+
+    <div v-else>
+      <no-auth></no-auth>
+    </div>
+
+    <import-template-modal :companyNo="currentCompany"  :visible.sync="templateModalVisible" @refresh="() => searchList()" />
+  </div>
+</template>
+
+<script>
+import asyncRequest from "@/apis/service/dataCorrection/managerCorrection";
+import mixinPage from "@/mixins/elPaginationHandle";
+import resToken from "@/mixins/resToken";
+import { columns } from "./columns";
+import { mapGetters } from "vuex";
+import companyHelper from "@/mixins/companyHelper";
+import ImportTemplateModal from "./components/importTemplateModal.vue"
+import { utils, writeFile } from "xlsx";
+import { template } from "./components/template";
+
+export default {
+  mixins: [mixinPage, resToken, companyHelper],
+  computed: {
+    ...mapGetters(["tablebtnSize", "searchSize", "size"]),
+    powers() {
+      const { btnList } = this.$store.getters;
+      const tran =
+        btnList.find(i => i.menu_route == "managerCorrection") || {};
+      const { action } = tran ?? {};
+      return action ?? [];
+    }
+  },
+  components:{
+    ImportTemplateModal
+  },
+  data() {
+    return {
+      loading: false,
+      statusOptions: [
+        { value: "1", label: "待审核" },
+        { value: "2", label: "审核通过" },
+        { value: "3", label: "审核驳回" }
+      ],
+      templateModalVisible:false,
+      parmValue: {
+        orderCode: "",
+        apply_name:"",
+        status: "",
+        page: 1, // 页码
+        size: 15 // 每页显示条数
+      },
+      // 表格 - 数据
+      tableData: [],
+      // 表格 - 参数
+      table: {
+        stripe: true,
+        border: true,
+        _defaultHeader_: ["setcol"]
+      },
+      // 表格 - 分页
+      pageInfo: {
+        size: 15,
+        curr: 1,
+        total: 0
+      },
+      // 表格 - 列参数
+      columns: columns
+    };
+  },
+  mounted() {
+    this.searchList();
+  },
+  methods: {
+    onDownloadTemplate() {
+      const workBook = new utils.book_new();
+      const workSheet = new utils.json_to_sheet(template);
+      utils.book_append_sheet(workBook, workSheet, "sheet");
+      writeFile(workBook, "批量修正业务经理模板.xlsx", {
+        bookType: "xlsx",
+      });
+    },
+    onImport(){
+      if(!this.currentCompany){
+        this.$message.warning('请选择一家业务公司');
+        return
+      }
+
+      this.templateModalVisible = true;
+    },
+    async searchList() {
+      this.loading = true;
+      const res = await asyncRequest.list({
+        companyNo: this.currentCompany,
+        ...this.parmValue
+      });
+      if (res && res.code === 0 && res.data) {
+        this.tableData = res.data.list;
+        this.pageInfo.total = Number(res.data.count);
+      } else if (res && res.code >= 100 && res.code <= 104) {
+        await this.logout();
+      } else {
+        this.tableData = [];
+        this.pageInfo.total = 0;
+      }
+      this.loading = false;
+    },
+    //重置
+    restSearch() {
+      // 表格 - 分页
+      this.pageInfo = {
+        size: 15,
+        curr: 1,
+        total: 0
+      };
+      this.parmValue = {
+        orderCode: "",
+        apply_name:"",
+        status: "",
+        page: 1, // 页码
+        size: 15 // 每页显示条数
+      };
+      this.searchList();
+    },
+    async handleTime(e) {
+      this.parmValue.start = e.startTime || "";
+      this.parmValue.end = e.endTime || "";
+      if (
+        (this.parmValue.start !== "" && this.parmValue.end !== "") ||
+        (this.parmValue.start === "" && this.parmValue.end === "")
+      ) {
+        this.pageInfo.curr = 1;
+        this.parmValue.page = 1;
+        await this.searchList();
+      }
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped></style>

src/views/sellOut/returnTransferStock/index.vue

@@ -126,9 +126,8 @@ searchList();
         </template>
         <template #operation="{ scope }">
           <el-button type="text" size="mini" @click="handleAssociation(scope)"
-            v-if="scope.row.status === '1'">关联采购单</el-button>
-          <el-button type="text" size="mini" v-if="scope.row.status === '2'"
-            @click="handleSecure(scope.row.id, scope.row.purcheaseOrder.cgdNo)">解除关联</el-button>
+            v-if="scope.row.status === '1' || scope.row.status === '3'">关联采购单</el-button>
+          <el-button type="text" size="mini" v-if="scope.row.status === '2'" @click="handleSecure(scope.row.id, scope.row.purcheaseOrder.cgdNo)">解除关联</el-button>
         </template>
       </ex-table>
 
@@ -188,7 +187,7 @@ export default {
       statusOptions: [
         { value: "1", label: "待关联" },
         { value: "2", label: "已关联" },
-        { value: "3", label: "取消关联" }
+        { value: "3", label: "已取消关联" }
       ],
       loading: false,
       showModel: false,