Prechádzať zdrojové kódy

财务修改,用户系统必填

lichao 3 rokov pred
rodič
commit
8c2b9ae48b

+ 1 - 0
src/views/finance/charge/kaihe-detail.vue

@@ -269,6 +269,7 @@
           @click="backrRconciliation"
           v-if="form.fBillstatus === '6'"
           :loading="subLoading"
+          v-hasPermi="['finance:charge:revoke']"
           >撤销收费</el-button
         >
         <el-button

+ 0 - 1
src/views/finance/contrast/index.vue

@@ -5043,7 +5043,6 @@ export default {
     },
     /** 打印准备 */
     printHandle() {
-      console.log(this.DzfeeList)
       for (let item in this.DzfeeList) {
         if (!this.DzfeeList[item].fId) {
           return this.$message.error("请先保存!");

+ 1 - 0
src/views/finance/contrast/kaihe-detail.vue

@@ -251,6 +251,7 @@
           @click="backrRconciliation"
           v-if="form.fBillstatus === '6'"
           :loading="subLoading"
+          v-hasPermi="['finance:contrast:revoke']"
           >撤销对账</el-button
         >
         <el-button

+ 8 - 8
src/views/finance/payment/index.vue

@@ -480,10 +480,10 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-          <el-form-item label="费方式" prop="chargingMethod">
+          <el-form-item label="费方式" prop="chargingMethod">
             <el-select
               v-model="queryParams.chargingMethod"
-              placeholder="请选择费方式"
+              placeholder="请选择费方式"
               clearable
               style="width: 200px"
               :disabled="notChange"
@@ -497,10 +497,10 @@
               ></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="款银行" prop="bank">
+          <el-form-item label="款银行" prop="bank">
             <el-input
               v-model="queryParams.bank"
-              placeholder="请输入款银行"
+              placeholder="请输入款银行"
               clearable
               size="small"
               style="width: 200px"
@@ -520,7 +520,7 @@
           <el-form-item label="水单号" prop="waterBillNo">
             <el-input
               v-model="queryParams.waterBillNo"
-              placeholder="请输入收款银行"
+              placeholder="请输入水单号"
               clearable
               size="small"
               style="width: 200px"
@@ -2273,7 +2273,7 @@ export default {
         {
           surface: "5",
           label: "fAccbilldate",
-          name: "费日期",
+          name: "费日期",
           checked: 0,
           width: 100,
         },
@@ -2287,7 +2287,7 @@ export default {
         {
           surface: "7",
           label: "chargingMethod",
-          name: "费方式",
+          name: "费方式",
           checked: 0,
           width: 100,
         },
@@ -2301,7 +2301,7 @@ export default {
         {
           surface: "9",
           label: "bank",
-          name: "款银行",
+          name: "款银行",
           checked: 0,
           width: 100,
         },

+ 1 - 0
src/views/finance/payment/kaihe-detail.vue

@@ -269,6 +269,7 @@
           @click="backrRconciliation"
           v-if="form.fBillstatus === '6'"
           :loading="subLoading"
+          v-hasPermi="['finance:payment:revoke']"
           >撤销付费</el-button
         >
         <el-button

+ 4 - 1
src/views/system/user/index.vue

@@ -240,7 +240,7 @@
           </el-form-item>
         </el-col>
           <el-col :span="12">
-            <el-form-item label="用户系统">
+            <el-form-item label="用户系统" prop="userSystem">
               <el-select v-model="form.userSystem" placeholder="请选择">
                 <el-option
                   v-for="dict in SystemOptions"
@@ -455,6 +455,9 @@ export default {
         deptId: [
           { required: true, message: "归属部门不能为空", trigger: "change" }
         ],
+        userSystem: [
+          { required: true, message: "用户系统不能为空", trigger: "change" }
+        ],
         email: [
           { required: true, message: "邮箱地址不能为空", trigger: "blur" },
           {