页面修改，新增认款操作

src/views/accounting/bankSlip/index.vue

@@ -85,10 +85,10 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="凭证id" prop="voucherId">
+      <el-form-item label="凭证号" prop="voucherNum">
         <el-input
-          v-model="queryParams.voucherId"
+          v-model="queryParams.voucherNum"
-          placeholder="请输入凭证id"
+          placeholder="请输入凭证号"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -164,7 +164,7 @@
 
     <!-- 列表 -->
     <el-table v-loading="loading" :data="list">
-      <el-table-column label="凭证id" align="center" prop="voucherId" />
+      <!-- <el-table-column label="凭证id" align="center" prop="voucherId" /> -->
       <el-table-column label="OA/ERP流程编号" align="center" prop="flowCode" />
       <el-table-column
         label="交易日期"
@@ -227,8 +227,16 @@
         label="操作"
         align="center"
         class-name="small-padding fixed-width"
+        width="180"
       >
         <template v-slot="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-s-check"
+            @click="handleComfirm(scope.row)"
+            >认款
+          </el-button>
           <el-button
             size="mini"
             type="text"
@@ -264,16 +272,29 @@
       width="1000px"
       append-to-body
     >
-      <el-form ref="form" :model="form" :rules="rules" label-width="130px">
+      <el-upload
+        class="upload-demo"
+        drag
+        :limit="1"
+        :action="uploadUrl"
+        :file-list="fileList"
+        :headers="headers"
+        :on-success="handleSuccess"
+        name="multipartFile"
+        :multiple="false"
+        :accept="imgType"
+      >
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+      </el-upload>
+      <el-form
+        ref="form"
+        :model="form"
+        :rules="rules"
+        label-width="110px"
+        style="margin-top: 20px"
+      >
         <el-row>
-          <el-col :span="8">
-            <el-form-item label="OA/ERP流程编号" prop="flowCode">
-              <el-input
-                v-model="form.flowCode"
-                placeholder="请输入OA/ERP流程编号"
-              />
-            </el-form-item>
-          </el-col>
           <el-col :span="8">
             <el-form-item label="交易日期" prop="tradTime">
               <el-date-picker
@@ -285,13 +306,6 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item label="银行" prop="bank">
-              <el-input v-model="form.bank" placeholder="请输入银行" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="8">
             <el-form-item label="交易类型" prop="type">
               <el-select v-model="form.type" placeholder="请选择交易类型">
@@ -299,6 +313,13 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="银行" prop="bank">
+              <el-input v-model="form.bank" placeholder="请输入银行" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="8">
             <el-form-item label="我方账户" prop="myCompany">
               <el-input v-model="form.myCompany" placeholder="请输入我方账户" />
@@ -530,6 +551,42 @@
         <el-button @click="cancel1">取 消</el-button>
       </div>
     </el-dialog>
+
+    <!-- 认款弹出框-->
+    <el-dialog title="认款" :visible.sync="open2" width="800px" append-to-body>
+      <el-form
+        ref="queryForm"
+        :model="queryParams"
+        :rules="rules"
+        label-width="140px"
+      >
+        <el-row>
+          <el-col :span="14">
+            <el-form-item label="经办人" prop="staffName">
+              <el-select
+                v-model="form1.staffName"
+                filterable
+                placeholder="请选择经办人"
+                value-key="id"
+                @change="handleSelectUser"
+              >
+                <el-option
+                  v-for="item in userOptions"
+                  :key="item.id"
+                  :value="item"
+                  :label="item.username"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm2">确 定</el-button>
+        <el-button @click="cancel2">取 消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -544,6 +601,8 @@ import {
   downloadXml,
   getBankSlipPageTime,
 } from "@/api/accounting/bankSlip";
+import { getAccessToken, getTenantId } from "@/utils/auth";
+import { listUser } from "@/api/system/user";
 
 export default {
   name: "BankSlip",
@@ -565,6 +624,7 @@ export default {
       // 是否显示弹出层
       open: false,
       open1: false,
+      open2: false,
       // 查询参数
       queryParams: {
         pageNo: 1,
@@ -612,15 +672,25 @@ export default {
         password: null,
         inputPassword: null,
       },
+      userOptions: [], //用户数据
       // 表单参数
       form: {},
+      form1: {},
       // 表单校验
       rules: {},
+      fileList: [], // 文件列表
+      uploadUrl:
+        process.env.VUE_APP_BASE_API + "/admin-api/archives/flow/upload", // 上传地址地址
+      headers: {
+        Authorization: "Bearer " + getAccessToken(),
+        "tenant-id": getTenantId(),
+      }, // 设置上传的请求头
       time: "",
     };
   },
   created() {
     this.getList();
+    this.getUserList();
   },
   methods: {
     /** 查询列表 */
@@ -643,6 +713,12 @@ export default {
         this.loading = false;
       });
     },
+    //获取用户
+    getUserList() {
+      listUser().then((response) => {
+        this.userOptions = response.data.list;
+      });
+    },
     handleOneMonth() {
       this.time = 1;
       this.getList2();
@@ -664,6 +740,10 @@ export default {
     cancel1() {
       this.open1 = false;
     },
+    /** 取消按钮 */
+    cancel2() {
+      this.open2 = false;
+    },
     /** 表单重置 */
     reset() {
       this.form = {
@@ -708,6 +788,13 @@ export default {
         archiveId: undefined,
         archiveState: undefined,
         password: undefined,
+        staffId: undefined,
+        staffName: undefined,
+      };
+      this.form1 = {
+        id: undefined,
+        staffId: undefined,
+        staffName: undefined,
       };
       this.resetForm("form");
     },
@@ -737,6 +824,23 @@ export default {
         this.title = "修改银行回单";
       });
     },
+    /** 认款按钮操作 */
+    handleComfirm(val) {
+      this.form1.id = val.id;
+      this.open2 = true;
+    },
+    handleSelectUser(val) {
+      this.form1.staffId = val.id;
+      this.form1.staffName = val.username;
+    },
+    submitForm2() {
+      console.log(this.form1);
+      updateBankSlip(this.form1).then((response) => {
+        this.$modal.msgSuccess("认款成功");
+        this.open2 = false;
+        this.getList();
+      });
+    },
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate((valid) => {

src/views/accounting/flow/index.vue

@@ -170,14 +170,6 @@
         style="margin-top: 20px"
       >
         <el-row>
-          <el-col :span="8">
-            <el-form-item label="OA/ERP流程编号" prop="flowCode">
-              <el-input
-                v-model="form.flowCode"
-                placeholder="请输入OA/ERP流程编号"
-              />
-            </el-form-item>
-          </el-col>
           <el-col :span="8">
             <el-form-item label="会计凭证" prop="voucherNum">
               <el-select
@@ -216,13 +208,6 @@
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="8">
-            <el-form-item label="流程号" prop="flowId">
-              <el-input v-model="form.flowId" placeholder="请输入流程号" />
-            </el-form-item>
-          </el-col>
           <el-col :span="8">
             <el-form-item label="摘要" prop="note">
               <el-input v-model="form.note" placeholder="请输入摘要" />
@@ -300,7 +285,6 @@ export default {
       // 是否显示弹出层
       open: false,
       open1: false,
-      fileList: [],
       imgType: ".jpeg, .jpg, .png",
       // 查询参数
       queryParams: {

src/views/accounting/voucher/index.vue

@@ -313,6 +313,7 @@
                 width: 240px;
                 height: 220px;
                 cursor: pointer;
+                margin: 0 10px;
               "
             >
             </el-image>
@@ -328,6 +329,7 @@
                 width: 240px;
                 height: 220px;
                 cursor: pointer;
+                margin: 0 10px;
               "
             >
             </el-image>
@@ -365,6 +367,7 @@
                 width: 240px;
                 height: 220px;
                 cursor: pointer;
+                margin: 0 10px;
               "
             >
             </el-image>