Merge branch 'purchaseDev' of http://172.16.100.139/new-business/drp-web into purchaseDev

src/utils/init.js

@@ -50,5 +50,5 @@ export const initDicts = (prop) => {
 };
 
 export const initPage = () => {
-  return { pageNum: 1, pageSize: 20, total: 0 };
+  return { pageNum: 1, pageSize: 100, total: 0 };
 };

src/views/purchase/DemandSummary/index.vue

@@ -235,7 +235,6 @@
         <el-table
           v-loading="loading"
           :data="tableList" 
-          fit
           :cell-style="{ borderColor: '#c0c0c0' }"
           :header-cell-style="{ borderColor: '#c0c0c0' }"
           class="exporttable"
@@ -250,7 +249,6 @@
           @row-click="rowSelect"
           @row-dblclick="doubleClick"
           ref="table"
-          :key="isUpdate"
         >
           <el-table-column type="selection" width="60" fixed="left"/>
           <el-table-column show-overflow-tooltip  label="序号" type="index" align="center" width="50px" fixed="left"/>
@@ -441,7 +439,6 @@ export default {
             return '手工新增'
         }
       },
-      isUpdate: false,
       expanded: false,
       // 页面配置
       isList: true,

src/views/purchase/apply/index.vue

@@ -1,137 +1,105 @@
 <script>
-import { dicts } from "./dicts";
-import useColumns from "./columns";
-import { LIST, mbDownload, failDownload} from "@/api/business/purchase/apply";
-// 导入的token
-import { getToken } from "@/utils/auth";
+  import {dicts} from "./dicts";
+  import useColumns from "./columns";
+  import {LIST, mbDownload, failDownload} from "@/api/business/purchase/apply";
+  // 导入的token
+  import {getToken} from "@/utils/auth";
 
-export default {
-  name: "PuchaseApply",
-  dicts: dicts,
-  components: {
-    SeeButton: () => import("./see/index.vue"),
-    AddButton: () => import("./add/index.vue"),
-    CopyButton: () => import("./copy/index.vue"),
-    EditButton: () => import("./edit/index.vue"),
-    DeleButton: () => import("./delete/index.vue"),
-    SubmButton: () => import("./submit/index.vue"),
-    ElSuperTable: () => import("@/components/super-table/index.vue"),
-    ElSuperSearch: () => import("@/components/super-search/index.vue"),
-  },
-  data() {
-    const { TableColumns, SearchColumns } = useColumns();
-    const page = this.$init.page();
-    const params = this.$init.params(SearchColumns);
-    return {
-      // 导入参数
-      upload: {
-        // 是否显示弹出层（导入）
-        open: false,
-        // 弹出层标题（导入）
-        title: "数据导入",
-        // 是否禁用上传
-        isUploading: false,
-        // 是否更新已经存在的用户数据
-        updateSupport: 1,
-        // 设置上传的请求头部
-        headers: { Authorization: "Bearer " + getToken() },
-        // 上传的地址
-        url: process.env.VUE_APP_BASE_API + "/pu/priceApply/import"
-      },
-      size: "mini",
-      loading: false,
-      params: params,
-      page: page,
-      tableData: [],
-      selectData: [],
-      SearchColumns: SearchColumns,
-      TableColumns: TableColumns,
-    };
-  },
-  computed: {},
-  created() {
-    this.useQuery(this.params, this.page);
-  },
-  methods: {
-    //
-    async fetchList(prop, page) {
-      try {
-        this.loading = true;
-        const { pageNum, pageSize } = page;
-        const { code, rows, total } = await LIST(
-          { ...prop },
-          { pageNum, pageSize }
-        );
-        if (code === 200) {
-          this.tableData = rows.map((item, index) => ({
-            ...item,
-            $index: (pageNum - 1) * pageSize + index + 1,
-          }));
-          this.page.total = total;
-        }
-      } catch (err) {
-        // catch
-        console.error(err);
-      } finally {
-        // finally
-        this.loading = false;
-      }
+  export default {
+    name: "PuchaseApply",
+    dicts: dicts,
+    components: {
+      SeeButton: () => import("./see/index.vue"),
+      AddButton: () => import("./add/index.vue"),
+      CopyButton: () => import("./copy/index.vue"),
+      EditButton: () => import("./edit/index.vue"),
+      DeleButton: () => import("./delete/index.vue"),
+      SubmButton: () => import("./submit/index.vue"),
+      ElSuperTable: () => import("@/components/super-table/index.vue"),
+      ElSuperSearch: () => import("@/components/super-search/index.vue"),
     },
-    // 查 询
-    useQuery(prop, page) {
-      this.fetchList(prop, page);
+    data() {
+      const {TableColumns, SearchColumns} = useColumns();
+      const page = this.$init.page();
+      const params = this.$init.params(SearchColumns);
+      return {
+        // 导入参数
+        upload: {
+          // 是否显示弹出层（导入）
+          open: false,
+          // 弹出层标题（导入）
+          title: "数据导入",
+          // 是否禁用上传
+          isUploading: false,
+          // 是否更新已经存在的用户数据
+          updateSupport: 1,
+          // 设置上传的请求头部
+          headers: {Authorization: "Bearer " + getToken()},
+          // 上传的地址
+          url: process.env.VUE_APP_BASE_API + "/pu/priceApply/import"
+        },
+        size: "mini",
+        loading: false,
+        params: params,
+        page: page,
+        tableData: [],
+        selectData: [],
+        SearchColumns: SearchColumns,
+        TableColumns: TableColumns,
+      };
     },
-    // 重 置
-    useReset() {
-      this.page = this.$init.page();
-      this.params = this.$init.params(this.SearchColumns);
+    computed: {},
+    created() {
       this.useQuery(this.params, this.page);
     },
-    // 选 择
-    useSelect(prop) {
-      this.selectData = prop;
-    },
-    // 明 细
-    async useSee(prop) {
-      const { open } = this.$refs.SeeButton;
-      await open([prop]);
-    },
-    // 下载模板
-    downLoadMb() {
-      this.$modal.loading("正在下载模板，请稍后...");
-      mbDownload().then(res => {
-        this.$modal.closeLoading();
-        const blob = new Blob([res], {
-          type: "application/vnd.ms-excel;charset=UTF-8",
-        });// 创建一个类文件对象：Blob对象表示一个不可变的、原始数据的类文件对象
-        const downloadElement = document.createElement("a"); //创建a标签
-        const href = window.URL.createObjectURL(blob); // 创建下载的链接
-        downloadElement.href = href;  //下载地址
-        downloadElement.download = '价格申报单导入模板' + this.parseTime(new Date().getTime()) + ".xlsx"; // 下载后文件名
-        document.body.appendChild(downloadElement);
-        downloadElement.click(); // 点击下载
-        document.body.removeChild(downloadElement); // 下载完成移除元素
-        window.URL.revokeObjectURL(href); // 释放blob对象
-      }).catch(err => {
-        this.$modal.closeLoading();
-      })
-    },
-    // 文件上传中处理
-    handleFileUploadProgress(event, file, fileList) {
-      this.upload.isUploading = true;
-      this.$modal.loading("正在导入数据，请稍后...");
-    },
-    // 文件上传成功处理
-    handleFileSuccess(response, file, fileList) {
-      this.$modal.closeLoading();
-      this.upload.open = false;
-      this.upload.isUploading = false;
-      this.$refs.upload.clearFiles();
-      this.$alert(response.data.msg, "导入结果", { dangerouslyUseHTMLString: true });
-      // 有失败的再次下载下来
-      if(response.data.flag) {
-        this.$modal.loading("正在下载导入失败数据，请稍后...");
-        failDownload({failDatas:response.data.datas}).then(res => {
+    methods: {
+      //
+      async fetchList(prop, page) {
+        try {
+          this.loading = true;
+          const {pageNum, pageSize} = page;
+          const {code, rows, total} = await LIST(
+            {...prop},
+            {pageNum, pageSize}
+          );
+          if (code === 200) {
+            this.tableData = rows.map((item, index) => ({
+              ...item,
+              $index: (pageNum - 1) * pageSize + index + 1,
+            }));
+            this.page.total = total;
+          }
+        } catch (err) {
+          // catch
+          console.error(err);
+        } finally {
+          // finally
+          this.loading = false;
+        }
+      },
+      // 查 询
+      useQuery(prop, page) {
+        this.fetchList(prop, page);
+      },
+      // 重 置
+      useReset() {
+        this.page = this.$init.page();
+        this.params = this.$init.params(this.SearchColumns);
+        this.useQuery(this.params, this.page);
+      },
+      // 选 择
+      useSelect(prop) {
+        this.selectData = prop;
+      },
+      // 明 细
+      async useSee(prop) {
+        const {open} = this.$refs.SeeButton;
+        await open([prop]);
+      },
+      // 下载模板
+      downLoadMb() {
+        this.$modal.loading("正在下载模板，请稍后...");
+        mbDownload().then(res => {
           this.$modal.closeLoading();
           const blob = new Blob([res], {
             type: "application/vnd.ms-excel;charset=UTF-8",
@@ -139,7 +107,7 @@ export default {
           const downloadElement = document.createElement("a"); //创建a标签
           const href = window.URL.createObjectURL(blob); // 创建下载的链接
           downloadElement.href = href;  //下载地址
-          downloadElement.download = '价格申报单导入失败数据' + this.parseTime(new Date().getTime()) + ".xlsx"; // 下载后文件名
+          downloadElement.download = '价格申报单导入模板' + this.parseTime(new Date().getTime()) + ".xlsx"; // 下载后文件名
           document.body.appendChild(downloadElement);
           downloadElement.click(); // 点击下载
           document.body.removeChild(downloadElement); // 下载完成移除元素
@@ -147,24 +115,63 @@ export default {
         }).catch(err => {
           this.$modal.closeLoading();
         })
-      }
-      this.useQuery(this.params, this.page);
-    },
-    errorFile(err) {
-      this.$modal.closeLoading();
-      this.$modal.notifyError("文件已变动，请重新上传");
-    },
-    // 提交上传文件
-    submitFileForm() {
-      this.$refs.upload.submit();
-    },
-    // 导入数据
-    importMb() {
-      this.upload.title = "文件导入"
-      this.upload.open = true
+      },
+      // 文件上传中处理
+      handleFileUploadProgress(event, file, fileList) {
+        this.upload.isUploading = true;
+        this.$modal.loading("正在导入数据，请稍后...");
+      },
+      // 文件上传成功处理
+      handleFileSuccess(response, file, fileList) {
+        this.$modal.closeLoading();
+        this.upload.open = false;
+        this.upload.isUploading = false;
+        this.$refs.upload.clearFiles();
+        if (response.code == 200) {
+          this.$alert(response.data.msg, "导入结果", {dangerouslyUseHTMLString: true});
+          // 有失败的再次下载下来
+          if (response.data.flag) {
+            this.$modal.loading("正在下载导入失败数据，请稍后...");
+            failDownload({failDatas: response.data.datas}).then(res => {
+              this.$modal.closeLoading();
+              const blob = new Blob([res], {
+                type: "application/vnd.ms-excel;charset=UTF-8",
+              });// 创建一个类文件对象：Blob对象表示一个不可变的、原始数据的类文件对象
+              const downloadElement = document.createElement("a"); //创建a标签
+              const href = window.URL.createObjectURL(blob); // 创建下载的链接
+              downloadElement.href = href;  //下载地址
+              downloadElement.download = '价格申报单导入失败数据' + this.parseTime(new Date().getTime()) + ".xlsx"; // 下载后文件名
+              document.body.appendChild(downloadElement);
+              downloadElement.click(); // 点击下载
+              document.body.removeChild(downloadElement); // 下载完成移除元素
+              window.URL.revokeObjectURL(href); // 释放blob对象
+            }).catch(err => {
+              this.$modal.closeLoading();
+            })
+          }
+        }else{
+          this.$notify({
+            message: response.msg,
+            type: response.code == 200 ? 'success' : 'warning'
+          });
+        }
+        this.useQuery(this.params, this.page);
+      },
+      errorFile(err) {
+        this.$modal.closeLoading();
+        this.$modal.notifyError("文件已变动，请重新上传");
+      },
+      // 提交上传文件
+      submitFileForm() {
+        this.$refs.upload.submit();
+      },
+      // 导入数据
+      importMb() {
+        this.upload.title = "文件导入"
+        this.upload.open = true
+      },
     },
-  },
-};
+  };
 </script>
 
 <template>
@@ -253,44 +260,45 @@ export default {
     <!-- 文件导入对话框 -->
     <el-dialog title="文件导入" :visible.sync="upload.open" width="400px">
       <el-upload
-      ref="upload"
-      :limit="1"
-      accept=".xlsx, .xls"
-      :headers="upload.headers"
-      :action="upload.url + '?updateSupport=' + upload.updateSupport"
-      :disabled="upload.isUploading"
-      :on-progress="handleFileUploadProgress"
-      :on-success="handleFileSuccess"
-      :on-error="errorFile"
-      :auto-upload="false"
-      drag
+        ref="upload"
+        :limit="1"
+        accept=".xlsx, .xls"
+        :headers="upload.headers"
+        :action="upload.url + '?updateSupport=' + upload.updateSupport"
+        :disabled="upload.isUploading"
+        :on-progress="handleFileUploadProgress"
+        :on-success="handleFileSuccess"
+        :on-error="errorFile"
+        :auto-upload="false"
+        drag
       >
-      <i class="el-icon-upload"></i>
-      <div class="el-upload__text">
-        将文件拖到此处，或
-        <em>点击上传</em>
-      </div>
-      <!-- <div class="el-upload__tip" slot="tip">
-        <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据
-      </div> -->
-      <div class="el-upload__tip" style="color:red" slot="tip">提示：仅允许导入“xls”或“xlsx”格式文件！</div>
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">
+          将文件拖到此处，或
+          <em>点击上传</em>
+        </div>
+        <!-- <div class="el-upload__tip" slot="tip">
+          <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据
+        </div> -->
+        <div class="el-upload__tip" style="color:red" slot="tip">提示：仅允许导入“xls”或“xlsx”格式文件！</div>
       </el-upload>
       <div slot="footer">
-      <el-button size="mini" type="primary" @click="submitFileForm">确 定</el-button>
-      <el-button size="mini" @click="upload.open = false">取 消</el-button>
+        <el-button size="mini" type="primary" @click="submitFileForm">确 定</el-button>
+        <el-button size="mini" @click="upload.open = false">取 消</el-button>
       </div>
     </el-dialog>
   </el-card>
 </template>
 <style scoped lang="scss">
-.el-card {
-  width: calc(100% - 32px);
-  height: calc(100vh - 32px);
-  margin: 16px;
-  padding: 16px;
-  border-radius: 8px;
-}
-.el-button-group + .el-button-group {
-  margin: 0 0 0 8px;
-}
+  .el-card {
+    width: calc(100% - 32px);
+    height: calc(100vh - 32px);
+    margin: 16px;
+    padding: 16px;
+    border-radius: 8px;
+  }
+
+  .el-button-group + .el-button-group {
+    margin: 0 0 0 8px;
+  }
 </style>

src/views/purchase/transferOrder/index.vue

@@ -97,6 +97,7 @@
           <el-table-column show-overflow-tooltip label="单据状态" align="center" prop="status" width="100px" :formatter="formatterStatus"/>
           <el-table-column show-overflow-tooltip label="调出库存组织" align="center" prop="deliveryInventoryOrgName" width="200px"/>
           <el-table-column show-overflow-tooltip label="订单类型" align="center" prop="billType" width="220px" :formatter="formatterBillType"/>
+          <el-table-column show-overflow-tooltip label="制单人" align="center" prop="createByName" width="100px"/>
           <el-table-column show-overflow-tooltip label="单据日期" align="center" prop="billDate" width="100px"/>
           <el-table-column show-overflow-tooltip label="调拨方式" align="center" prop="allotType" width="180px">
             <template slot-scope="scope">
@@ -120,7 +121,6 @@
           <el-table-column show-overflow-tooltip label="利润中心" align="center" prop="liacenterName" width="150px"/>
           <!-- <el-table-column show-overflow-tooltip label="已同步WMS" align="center" prop="isSendWms" width="150px"/> -->
           <el-table-column show-overflow-tooltip label="备注" align="center" prop="remark" width="150px"/>
-          <el-table-column show-overflow-tooltip label="制单人" align="center" prop="createByName" width="100px"/>
           <el-table-column show-overflow-tooltip label="制单日期" align="center" prop="createTime" width="150px"/>
           <!-- <el-table-column show-overflow-tooltip label="审批人" align="center" prop="code" width="150px"/> -->
           <!-- <el-table-column show-overflow-tooltip label="审批日期" align="center" prop="code" width="150px"/> -->