Merge remote-tracking branch 'origin/main'

src/api/accounting/bankSlip.js

@@ -18,6 +18,15 @@ export function updateBankSlip(data) {
   })
 }
 
+// 关联会计凭证
+export function updateArrayBankSlip(data) {
+  return request({
+    url: '/archives/bank-slip/update/array',
+    method: 'put',
+    data: data
+  })
+}
+
 // 删除银行回单
 export function deleteBankSlip(id) {
   return request({

src/views/accounting/bankSlip/index.vue

@@ -673,12 +673,12 @@
       width="800px"
       append-to-body
     >
-      <el-form ref="form" :model="form" :rules="rules" label-width="140px">
+      <el-form ref="PZform" :model="PZform" :rules="rules" label-width="140px">
         <el-row>
           <el-col :span="14">
-            <el-form-item label="会计凭证" prop="voucherId">
+            <el-form-item label="会计凭证">
               <el-input
-                v-model="form.voucherId"
+                v-model="PZform.voucherNum"
                 placeholder="请选择凭证"
                 readonly
               >
@@ -719,6 +719,7 @@ import {
   exportBankSlipExcel,
   downloadXml,
   getBankSlipPageTime,
+  updateArrayBankSlip,
 } from "@/api/accounting/bankSlip";
 import { getAccessToken, getTenantId } from "@/utils/auth";
 import { listUser } from "@/api/system/user";
@@ -735,10 +736,8 @@ export default {
       optType: undefined,
       // 遮罩层
       loading: true,
-      // 多个禁用
-      multiple: true,
       // 非多个禁用
-      multiple1: true,
+      multiple: true,
       // 导出遮罩层
       exportLoading: false,
       // 显示搜索条件
@@ -813,6 +812,10 @@ export default {
       // 表单参数
       form: {},
       form1: {},
+      PZform: {
+        voucherId: undefined,
+        voucherNum: undefined,
+      },
       // 表单校验
       rules: {
         staffName: [{ required: true, message: "请选择", trigger: "blur" }],
@@ -1143,28 +1146,24 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      console.log(selection);
       this.ids = selection.map((item) => item.id);
-      if (selection.length == 1) {
+      this.multiple = !selection.length;
-        this.multiple = false;
-        this.form = selection[0];
-      } else {
-        this.multiple = true;
-      }
-      this.multiple1 = !selection.length;
     },
     //关联凭证
     handleGLPZ() {
-      this.form.voucherId = null;
       this.open2 = true;
-      console.log(this.form);
+      this.PZform = {
+        voucherId: undefined,
+        voucherNum: undefined,
+      };
     },
     submitForm2() {
-      this.$refs["form"].validate((valid) => {
+      this.$refs["PZform"].validate((valid) => {
         if (!valid) {
           return;
         }
-        updateBankSlip(this.form).then((response) => {
+        const data = { id: this.ids, voucherId: this.PZform.voucherId };
+        updateArrayBankSlip(data).then((response) => {
           this.$modal.msgSuccess("关联成功");
           this.open2 = false;
           this.multiple = true;
@@ -1176,9 +1175,9 @@ export default {
       this.$refs.VoucherSelect.showFlag = true;
     },
     onVoucherSelected(obj) {
-      console.log(obj);
       if (obj != undefined && obj != null) {
-        this.form.voucherId = obj.id;
+        this.PZform.voucherId = obj.id;
+        this.PZform.voucherNum = obj.voucherNum;
       }
     },
   },

src/views/accounting/invoices/index.vue

@@ -1177,7 +1177,6 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      console.log(selection);
       this.ids = selection.map((item) => item.id);
       this.multiple = !selection.length;
     },
@@ -1383,7 +1382,6 @@ export default {
       this.$refs.VoucherSelect.showFlag = true;
     },
     onVoucherSelected(obj) {
-      console.log(obj);
       if (obj != undefined && obj != null) {
         this.PZform.voucherId = obj.id;
         this.PZform.voucherNum = obj.voucherNum;

src/views/accounting/voucherDetails/index.vue

@@ -204,11 +204,6 @@
               />
             </el-form-item>
           </el-col>
-          <!-- <el-col :span="8">
-            <el-form-item label="条目顺序号" prop="lineNum">
-              <el-input v-model="form.lineNum" placeholder="请输入条目顺序号" />
-            </el-form-item>
-          </el-col> -->
           <el-col :span="8">
             <el-form-item label="科目编码" prop="subjectCode">
               <el-input
@@ -227,6 +222,11 @@
           </el-col>
         </el-row>
         <el-row>
+          <el-col :span="8">
+            <el-form-item label="条目顺序号" prop="lineNum">
+              <el-input v-model="form.lineNum" placeholder="请输入条目顺序号" />
+            </el-form-item>
+          </el-col>
           <el-col :span="8">
             <el-form-item label="辅助核算" prop="assistCheck">
               <el-input
@@ -252,8 +252,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
-          <el-col :span="8">
         <el-form-item label="摘要" prop="digest">
           <el-input
             v-model="form.digest"
@@ -262,8 +260,6 @@
             placeholder="请输入摘要"
           />
         </el-form-item>
-          </el-col>
-        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm" v-if="optType != 'view'"
@@ -346,6 +342,12 @@ export default {
         voucherNum: [
           { required: true, message: "凭证号不能为空", trigger: "blur" },
         ],
+        subjectCode: [
+          { required: true, message: "科目编码不能为空", trigger: "blur" },
+        ],
+        subjectName: [
+          { required: true, message: "科目名称不能为空", trigger: "blur" },
+        ],
       },
     };
   },

src/views/archives/prefile/index.vue

@@ -777,9 +777,19 @@
       @pagination="getList"
     />
     <!-- 财务档案列表 -->
-    <el-table  v-loading="loading" :data="electronicFinanceList" v-if="fileType == 'electronic_finance'" @selection-change="handleSelectionChange">
+    <el-table
+      v-loading="loading"
+      :data="electronicFinanceList"
+      v-if="fileType == 'electronic_finance'"
+      @selection-change="handleSelectionChange"
+    >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="交易日期" align="center" prop="tradeDate" width="180">
+      <el-table-column
+        label="交易日期"
+        align="center"
+        prop="tradeDate"
+        width="180"
+      >
         <template v-slot="scope">
           <span>{{ parseTime(scope.row.tradeDate) }}</span>
         </template>
@@ -799,7 +809,11 @@
 
       <el-table-column label="金额" align="center" prop="price" />
 
-      <el-table-column label="收据/发票号码" align="center" prop="invoiceNumber"/>
+      <el-table-column
+        label="收据/发票号码"
+        align="center"
+        prop="invoiceNumber"
+      />
       <!--      <el-table-column label="纸档位置" align="center" prop="position" />-->
       <!--      <el-table-column label="完整性" align="center" prop="cherks">-->
       <!--        <template v-slot="scope">-->
@@ -817,7 +831,10 @@
       <el-table-column label="项目" align="center" prop="project" />
       <el-table-column label="状态" align="center" prop="status">
         <template v-slot="scope">
-          <dict-tag :type="DICT_TYPE.CONTRACT_STATUS" :value="scope.row.status"/>
+          <dict-tag
+            :type="DICT_TYPE.CONTRACT_STATUS"
+            :value="scope.row.status"
+          />
         </template>
       </el-table-column>
       <!--      <el-table-column label="归档状态" align="center" prop="fileStatus">-->
@@ -855,7 +872,12 @@
       <!--      </el-table-column>-->
     </el-table>
     <!-- 财务档案分页组件 -->
-    <pagination v-if="fileType == 'electronic_finance'" v-show="total11 > 0" :total="total11" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
+    <pagination
+      v-if="fileType == 'electronic_finance'"
+      v-show="total11 > 0"
+      :total="total11"
+      :page.sync="queryParams.pageNo"
+      :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
 
@@ -1013,7 +1035,7 @@ import { listData } from "@/api/system/dict/data";
 import { getSiteTree } from "@/api/setting/organization";
 import { getOrganizationPage } from "@/api/setting/organization";
 import { getAccountingReportPage } from "@/api/accounting/report";
-import { getFinancePage } from '@/api/ea/electronicfinance/finance'
+import { getFinancePage } from "@/api/ea/electronicfinance/finance";
 
 export default {
   name: "Voucher",
@@ -1071,7 +1093,29 @@ export default {
       Fileform: {},
       fileType: "accounting_voucher",
       // 表单校验
-      rules: {},
+      rules: {
+        company: [
+          { required: true, message: "业务实体不能为空", trigger: "blur" },
+        ],
+        year: [
+          { required: true, message: "会计年份不能为空", trigger: "blur" },
+        ],
+        period: [
+          { required: true, message: "会计月份不能为空", trigger: "blur" },
+        ],
+        caseNum: [
+          { required: true, message: "全宗号不能为空", trigger: "blur" },
+        ],
+        catalogNum: [
+          { required: true, message: "目录号不能为空", trigger: "blur" },
+        ],
+        filesNum: [
+          { required: true, message: "案卷号不能为空", trigger: "blur" },
+        ],
+        recordTime: [
+          { required: true, message: "归档时间不能为空", trigger: "blur" },
+        ],
+      },
       ids: "", // 选中id
       fileData: "", //归档id
       fileTypeOptions: [], //档案类型
@@ -1151,10 +1195,10 @@ export default {
         this.loading = false;
       });
       /** 查询财务档案列表 */
-      getFinancePage(this.queryParams).then(response => {
+      getFinancePage(this.queryParams).then((response) => {
-          this.electronicFinanceList = response.data.list
+        this.electronicFinanceList = response.data.list;
-          this.total11 = response.data.total
+        this.total11 = response.data.total;
-          this.loading = false
+        this.loading = false;
       });
     },
     /** 获取目录号 */

src/views/setting/detection/index.vue

@@ -124,10 +124,13 @@
         <el-table-column label="依据和方法" align="center" prop="methods" />
         <el-table-column label="是否开启" align="center" prop="enableFlag">
           <template v-slot="scope">
-            <dict-tag
+            <el-switch
-              :type="DICT_TYPE.INFRA_BOOLEAN_STRING"
+              v-model="scope.row.enableFlag"
-              :value="scope.row.enableFlag"
+              active-color="#13ce66"
-            />
+              inactive-color="#ff4949"
+              @change="handleChangeStatus(scope.row)"
+            >
+            </el-switch>
           </template>
         </el-table-column>
       </el-table>
@@ -281,6 +284,10 @@ export default {
       this.resetForm("queryForm");
       this.handleQuery();
     },
+    //切换状态
+    handleChangeStatus(data) {
+      updateDetection(data).then((response) => {});
+    },
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();