1.完成单据生成页面功能

src/api/basic/busTypeChange.js

@@ -0,0 +1,33 @@
+import axios from "../../utils/request";
+
+export function getBusTypeChangeList(params) {
+  return axios({
+    url: "/basic/bustype/change/filter",
+    method: "get",
+    params: params
+  });
+}
+
+export function addBusTypeChange(data) {
+  return axios({
+    url: "/basic/bustype/change/insert",
+    method: "post",
+    data: data
+  });
+}
+
+export function updateBusTypeChange(data) {
+  return axios({
+    url: "/basic/bustype/change/update",
+    method: "post",
+    data: data
+  });
+}
+
+export function deleteBusTypeChange(data) {
+  return axios({
+    url: "/basic/bustype/change/delete",
+    method: "post",
+    data: data
+  });
+}

src/views/system/param/busTypeChange.vue

@@ -5,63 +5,40 @@
         <el-form-item class="query-form-item" label="单据类型名称:">
           <el-input
             v-model="filterQuery.name"
-            placeholder="单据类型名称"
+            placeholder="请输入单据类型名称"
           ></el-input>
         </el-form-item>
         <el-form-item class="query-form-item" label="单据类型代码:">
           <el-input
             v-model="filterQuery.originAction"
-            placeholder="单据类型代码"
+            placeholder="请输入单据类型代码"
           ></el-input>
         </el-form-item>
         <el-form-item>
           <el-button-group style="margin-left: 10px;display:flex;">
             <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
             <el-button type="primary" icon="el-icon-search" @click="search">查询</el-button>
-            <el-button type="primary" icon="el-icon-plus" @click="handleAddClick">新增
+            <el-button type="primary" icon="el-icon-plus" @click="handleAddClick">新增</el-button>
-            </el-button
-            >
-            <el-button type="primary" icon="el-icon-download" @click="exportJsonFile">导出单据类型</el-button>
-            <el-upload
-              :action="uploadFileUrl"
-              multiple
-              :limit="3"
-              :headers="headers"
-              :show-file-list="false"
-              :on-success="handleChange"
-              :file-list="fileList"
-            >
-              <el-button icon="el-icon-upload2" type="primary">导入单据类型</el-button>
-            </el-upload>
           </el-button-group>
-
         </el-form-item>
       </el-form>
 
       <el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row>
         <el-table-column label="序号" type="index" width="60"></el-table-column>
-        <el-table-column label="单据类型" prop="name"></el-table-column>
+        <el-table-column label="补单类型名称" prop="originName"></el-table-column>
-        <el-table-column label="出入库类型" prop="mainAction">
+        <el-table-column label="补单类型代码" prop="originAction"></el-table-column>
+        <el-table-column label="目标单据类型" prop="targetBusName"></el-table-column>
+        <el-table-column label="类型" prop="type">
           <template slot-scope="scope">
-            <span>{{ mainActionMap[scope.row.mainAction] }}</span>
+            <span>{{ typeMap[scope.row.type] }}</span>
           </template>
         </el-table-column>
-        <!--        <el-table-column label="扫码单据类型代码" prop="action" fixed></el-table-column>-->
+        <el-table-column label="状态" prop="enable">
-        <el-table-column label="是否启用" prop="enable">
           <template slot-scope="scope">
             <span>{{ enableMap[scope.row.enable] }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="一次校验" prop="checkEnable">
+        <el-table-column label="备注" prop="remark"></el-table-column>
-          <template slot-scope="scope">
-            <span>{{ enableMap[scope.row.checkEnable] }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="二次核对" prop="secCheckEnable">
-          <template slot-scope="scope">
-            <span>{{ enableMap[scope.row.secCheckEnable] }}</span>
-          </template>
-        </el-table-column>
         <el-table-column label="操作">
           <template slot-scope="scope">
             <el-button
@@ -72,8 +49,7 @@
             >
             <el-button
               type="text"
-              :disabled="!configParams.typeScan"
+              @click.native.stop="deleteDialog(scope.row.id)"
-              @click.native.stop="deleteDialog(scope.row)"
             >删除
             </el-button
             >
@@ -83,18 +59,18 @@
       </el-table>
 
       <el-dialog
-        title="新增扫码单据类型"
+        :title="formMap[formName]"
-        :visible.sync="addDialogVisible"
+        :visible.sync="modifyDialogVisible"
         :close-on-click-modal="false"
         :close-on-press-escape="false"
-        v-if="addDialogVisible"
+        v-if="modifyDialogVisible"
         class="dialog-two"
         width="60%"
         top="5vh"
       >
+        <modifyDialog :inputQuery="inputQuery"></modifyDialog>
         <div slot="footer" class="dialog-footer">
           <el-button type="primary" size="small" @click="onAddSubmit"
-                     :disabled="!configParams.typeScan"
           >提交
           </el-button
           >
@@ -105,27 +81,6 @@
         </div>
       </el-dialog>
 
-      <el-dialog
-        title="编辑单据类型"
-        :visible.sync="modifyDialogVisible"
-        width="70%"
-        :close-on-click-modal="false"
-        :close-on-press-escape="false"
-        v-if="modifyDialogVisible"
-      >
-        <div style="text-align: center">
-          <el-button type="primary" size="small" icon="search" @click="onModifySubmit"
-                     :disabled="!configParams.typeScan"
-          >提交
-          </el-button
-          >
-          <el-button type="primary" size="small" icon="search" @click="cancelDialog"
-          >取消
-          </el-button
-          >
-        </div>
-      </el-dialog>
-
       <pagination
         v-show="total>0"
         :total="total"
@@ -137,81 +92,33 @@
   </div>
 </template>
 <script>
-import {getBusTypeList, deleteBusType, updateBusType, insertBusType, exportFile} from "@/api/basic/busType";
-import axios from "axios";
-import store from "@/store";
-import {findConfig} from "@/api/thrsys/spsSyncStatus";
 import {isBlank} from "@/utils/strUtil";
+import modifyDialog from "@/views/system/param/busTypeChangeModify.vue";
+import {getBusTypeChangeList, updateBusTypeChange, addBusTypeChange, deleteBusTypeChange} from "@/api/basic/busTypeChange";
 
 export default {
   data() {
     return {
       filterQuery: {
         name: null,
-        mainAction: null,
+        originAction: null,
-        enable: "1",
         page: 1,
         limit: 20,
       },
-      addDialogVisible: false,
       modifyDialogVisible: false,
       list: [],
       inputQuery: {
-        action: "",
+        id: null,
-        name: "",
+        originName: null,
-        enable: null,
-        remark: "",
-        mainAction: "",
-        thirdSysFk: "",
-        id: "",
-        checkEnable: false,
-        genUnit: false,
-        innerOrder: false,
-        spUse: null,
-        secCheckEnable: null,
-        checkUdims: null,
-        checkPdaEd: null,
-        checkPdaUn: null,
-        checkPc: null,
-        checkWebNew: null,
-        checkChange: null,
-        checkCopy: null,
-        secCheckUdims: null,
-        secCheckPdaEd: null,
-        secCheckPdaUn: null,
-        secCheckPc: null,
-        secCheckWebNew: null,
-        secCheckChange: null,
-        thirdAction: null,
-        secCheckSp: null,
-        checkSp: null,
-        checkBalacne: null,
-        secCheckBalacne: null,
-        secCheckCopy: null,
-        corpType: null,
-        storageCode: null,
-        supplementOrderType: null,
-        defaultUnit: null,
-        useDyCount: null,
-        expireTip: true,
-        prefix: null,
-        outTospms: null,
-        ullageFill: null,
-        scanPreIn: null,
-        vailInv: null,
-        entrutSpms: null,
-        codeFillCheck: null,
-        defaultInv: null,
-        defaultSubInv: null,
-        orderVisibleType: 0,
-        advanceType: null,
-        preIn: null,
         originAction: null,
-        comments: null,
+        targetAction: null,
+        name: null,
+        enable: null,
+        remark: null
       },
       enableMap: {
-        true: "是",
+        false: "禁用",
-        false: "否",
+        true: "启用",
       },
       mainActionMap: {
         WareHouseIn: "入库",
@@ -220,10 +127,19 @@ export default {
       fileList: [],
       total: 0,
       multipleSelection: [],
-      uploadFileUrl: null,
       headers: {},
       configParams: {},
       loading: false,
+      typeMap: {
+        1: "耗材领用",
+        2: "产品申购",
+        3: "采购计划",
+      },
+      formMap: {
+        add: "新增单据生成设置",
+        edit: "编辑单据生成设置",
+      },
+      formName: null,
 
     };
   },
@@ -235,8 +151,7 @@ export default {
       });
       this.filterQuery = {
         name: null,
-        mainAction: null,
+        originAction: null,
-        enable: "1",
         page: 1,
         limit: 20,
       };
@@ -244,7 +159,6 @@ export default {
     },
     cancelDialog() {
       this.modifyDialogVisible = false;
-      this.addDialogVisible = false;
     },
     search() {
       this.filterQuery.page = 1;
@@ -252,7 +166,7 @@ export default {
     },
     getList() {
       this.loading = true;
-      getBusTypeList(this.filterQuery)
+      getBusTypeChangeList(this.filterQuery)
         .then((response) => {
           if (response.code === 20000) {
             this.list = response.data.list || [];
@@ -274,155 +188,98 @@ export default {
     },
 
     onAddSubmit() {
-      if (isBlank(this.inputQuery.name)) {
+      if (isBlank(this.inputQuery.originName)) {
-        this.$message.error("单据类型名称不能为空！");
+        this.$message.error("补单类型名称不能为空！")
         return;
       }
-      if (this.$isBlank(this.inputQuery.corpType)) {
+      if (isBlank(this.inputQuery.originAction)) {
-        this.$message.error("往来信息类型不能为空！");
+        this.$message.error("补单类型代码不能为空！");
         return;
       }
-      if (this.inputQuery.mainAction == "" || this.inputQuery.mainAction == null) {
+      if (isBlank(this.inputQuery.targetAction)) {
-        this.$message.error("出入库类型不能为空！");
+        this.$message.error("目标单据类型不能为空！")
         return;
       }
-      this.inputQuery.enable = 1;
+      if (isBlank(this.inputQuery.enable)) {
-      insertBusType(this.inputQuery)
+        this.$message.error("请选择启用状态！")
-        .then((response) => {
+        return;
-          if (response.code == 20000) {
+      }
+
+      if (this.formName === "add") {
+        let numRegExp = '^[0-9]*$';
+        let numReg = new RegExp(numRegExp);
+        if (numReg.test(this.inputQuery.name)) {
+          this.$message.error("单据类型名称不得为纯数字类型！");
+          return;
+        }
+        this.inputQuery.type = 1;           //默认类型为耗材领用
+
+        addBusTypeChange(this.inputQuery).then((res) => {
+          if (res.code === 20000) {
             this.loading = false;
             this.cancelDialog();
             this.getList();
           } else {
-            this.$message.error(response.message);
+            this.$message.error(res.message);
           }
-        })
+        }).catch((error) => {
-        .catch(() => {
           this.loading = false;
+          this.$message.error(error.message);
           this.cancelDialog();
         });
-    },
+      } else {
-
+        updateBusTypeChange(this.inputQuery).then((res) => {
-    onModifySubmit() {
+          if (res.code === 20000) {
-      if (this.inputQuery.mainAction == "" || this.inputQuery.mainAction == null) {
-        this.$message.error("出入库类型不能为空！");
-        return;
-      }
-      updateBusType(this.inputQuery)
-        .then((response) => {
-          if (response.code == 20000) {
             this.loading = false;
             this.cancelDialog();
             this.getList();
           } else {
-            this.$message.error(response.message);
+            this.$message.error(res.message);
           }
-        })
+        }).catch((error) => {
-        .catch(() => {
           this.loading = false;
+          this.$message.error(error.message);
           this.cancelDialog();
         });
-    },
+      }
-    exportJsonFile() {
-      exportFile().then((response) => {
-        const binaryData = [];
-        binaryData.push(response);
-        let url = window.URL.createObjectURL(
-          new Blob(binaryData, {type: "application/json"})
-        );
-        this.loading = false;
-        const eleLink = document.createElement('a');
-        // var timestamp = "yyyy-MM-dd_hh:mm";
-        eleLink.download = "扫码单据类型导出" + ".json";
-        eleLink.style.display = 'none';
-        eleLink.href = url;
-        document.body.appendChild(eleLink)
-        eleLink.click()
-        document.body.removeChild(eleLink)
-      }).catch(() => {
-        this.loading = false;
-      });
     },
 
     handleAddClick() {
-      this.inputQuery = {enable: false, expireTip: true};
+      this.formName = 'add';
-      this.addDialogVisible = true;
+      this.modifyDialogVisible = true;
     },
 
     handleModifyClick(row) {
+      this.formName = 'edit';
       this.inputQuery = row;
       this.modifyDialogVisible = true;
     },
 
     deleteDialog(rowId) {
-      this.$confirm("此操作将永久删除该扫码类型信息, 是否继续?", "提示", {
+      this.$confirm("此操作将永久删除该补单设置, 是否继续?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
       })
         .then(() => {
-          this.deleteOrders(rowId);
+          let params = {id: rowId};
-        })
+          deleteBusTypeChange(params).then((res) => {
-        .catch(() => {
+            if (res.code === 20000) {
-        });
+              this.$message.success("删除成功！");
-    },
+              this.getList();
-
+            } else {
-    deleteOrders(data) {
+              this.$message.error(res.message);
-      this.loading = true;
+            }
-      let tquery = {
+          })
-        id: data.id + "",
-      };
-      deleteBusType(tquery)
-        .then((response) => {
-          this.getList();
-          if (response.code == 20000) {
-            this.$message({
-              type: "success",
-              message: "删除成功！",
-            });
-          } else {
-            this.$message.error(response.message);
-          }
-
-        })
-        .catch(() => {
-        });
-    },
-    handleChange(response, files, fileList) {
-      if (response.code != 20000) {
-        this.$message.error(response.message);
-      } else {
-        this.$message.success(response.data);
-        this.getList();
-      }
-    },
-    init() {
-      axios.get("./config.json").then(res => {
-        // 基础地址
-        let response = res.data.BASE_URL;
-        this.uploadFileUrl = response + "/udiwms/busstiness/file/upload";
-      });
-      this.headers = {
-        ADMIN_ID: store.getters.adminId,
-        ADMIN_TOKEN: store.getters.token,
-      };
-    },
-    getSyncConfig() {
-      findConfig()
-        .then((response) => {
-          if (response.code == 20000) {
-            this.configParams = response.data;
-          }
         })
         .catch(() => {
         });
     },
   },
-  mounted() {
+  components: {
+    modifyDialog
   },
   created() {
-    this.init();
-    this.getSyncConfig();
     this.getList();
   },
 };

src/views/system/param/busTypeChangeModify.vue

@@ -0,0 +1,142 @@
+<template>
+  <div>
+    <el-form :model="inputQuery" :rules="formRules" ref="dataForm" label-width="120px" border>
+      <el-row type="flex">
+        <el-col :span="11">
+          <el-form-item label="单据类型名称" prop="originName">
+            <el-input v-model="inputQuery.originName" :disabled="!isAdd" size="small" placeholder="请输入内容" style="width: 90%"></el-input>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="11">
+          <el-form-item label="单据类型代码" prop="originAction">
+            <el-input v-model="inputQuery.originAction" :disabled="!isAdd" size="small" placeholder="请输入内容" style="width: 90%"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+
+      <el-row type="flex">
+        <el-col :span="11">
+          <el-form-item label="目标单据类型" prop="targetAction">
+            <el-select v-model="inputQuery.targetAction" placeholder="请选择" clearable size="small" style="width: 90%">
+              <el-option
+                v-for="item in busTypes"
+                :key="item.action"
+                :label="item.name"
+                :value="item.action">
+                <span style="float: left"> {{item.name}}</span>
+                <span style="float: right; color: #8492a6; font-size: 13px">{{item.action}}</span>
+              </el-option>
+
+            </el-select>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="11">
+          <el-form-item label="启用状态" prop="enable">
+            <el-select v-model="inputQuery.enable"
+                       size="small"
+                       placeholder="启用状态"
+                       style="width: 90%"
+                       clearable
+                       >
+              <el-option label="启用" :value="true"></el-option>
+              <el-option label="禁用" :value="false"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row type="flex">
+        <el-col :span="23" type="flex">
+          <el-form-item prop="comments">
+            <label slot="label">备&emsp;&emsp;注</label>
+            <el-input v-model="inputQuery.remark" size="small" style="width: 90%" type="textarea"
+                      row="3"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+    </el-form>
+  </div>
+</template>
+
+<script>
+
+import {getBusTypeList} from "@/api/basic/busType";
+
+export default {
+  name: "BusTypePreModify",
+  props: {
+    inputQuery: {
+      type: Object,
+      required: true,
+    },
+  },
+
+  data() {
+    return {
+      filterQuery: {
+        enabled: true,
+        isBuType: true,
+      },
+      busTypes: [],
+      isAdd: false,
+      formRules: {
+        originName: [
+          {
+            required: true,
+            message: "补单类型名称不能为空",
+            trigger: "blur"
+          }
+        ],
+        originAction: [
+          {
+            required: true,
+            message: "补单类型代码不能为空",
+            trigger: "blur"
+          }
+        ],
+        targetAction: [
+          {
+            required: true,
+            message: "目标单据类型不能为空",
+            trigger: "blur"
+          }
+        ],
+        enable: [
+          {
+            required: true,
+            message: "请选择启用状态",
+            trigger: "blur"
+          }
+        ],
+      },
+    }
+  },
+  methods: {
+    getBusType() {
+      let params = {
+        enable: true
+      };
+      getBusTypeList(params).then((res) => {
+        if (res.code === 20000) {
+          this.busTypes = res.data.list || [];
+        }
+      })
+    }
+  },
+
+  created() {
+    if (this.inputQuery.originAction == null) {
+      this.isAdd = true;
+    }
+    this.getBusType();
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/system/param/busTypePre.vue

@@ -25,8 +25,8 @@
 
       <el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row>
         <el-table-column label="序号" type="index" width="60"></el-table-column>
-        <el-table-column label="补单类型名称" prop="originName"></el-table-column>
+        <el-table-column label="单据类型名称" prop="originName"></el-table-column>
-        <el-table-column label="补单类型代码" prop="originAction"></el-table-column>
+        <el-table-column label="单据类型代码" prop="originAction"></el-table-column>
         <el-table-column label="目标单据类型" prop="targetBusName"></el-table-column>
         <el-table-column label="类型" prop="type">
           <template slot-scope="scope">
@@ -97,7 +97,6 @@
   </div>
 </template>
 <script>
-import {getBusTypeList, deleteBusType, updateBusType, insertBusType} from "@/api/basic/busType";
 import {isBlank} from "@/utils/strUtil";
 import modifyDialog from "@/views/system/param/busTypePreModify.vue";
 import {

src/views/system/param/busTypePreModify.vue

@@ -64,6 +64,8 @@
 
 <script>
 
+import {getBusTypeList} from "@/api/basic/busType";
+
 export default {
   name: "BusTypePreModify",
   props: {
@@ -115,7 +117,14 @@ export default {
   },
   methods: {
     getBusType() {
-
+      let params = {
+        enable: true
+      };
+      getBusTypeList(params).then((res) => {
+        if (res.code === 20000) {
+          this.busTypes = res.data.list || [];
+        }
+      })
     }
   },