Просмотр исходного кода

1.结算中心 修改标签名称
2.账单中心 列表页显示两个字段
3.挂账销账 修改按钮名称
4.挂账销账 已完成 不显示已结算数据
5.优化公共选择器组件 初始化组件时不调接口 展开下拉时调用接口

Qukatie 1 неделя назад
Родитель
Сommit
3a6b7718a1

+ 7 - 1
src/components/dicSelect/main.vue

@@ -297,6 +297,10 @@ export default {
             type: Boolean,
             type: Boolean,
             default: false
             default: false
         },
         },
+        initData: {
+            type: Boolean,
+            default: false
+        }
     },
     },
     model: {
     model: {
         prop: "value",
         prop: "value",
@@ -306,7 +310,9 @@ export default {
     },
     },
     mounted() {
     mounted() {
         if (this.activateCreated) {
         if (this.activateCreated) {
-            this.getDicData()
+          if (this.initData) {
+                this.getDicData()
+            }
         } else {
         } else {
             this.options = this.mockData
             this.options = this.mockData
         }
         }

Разница между файлами не показана из-за своего большого размера
+ 432 - 312
src/views/billM/billingCenter/index.vue


+ 1 - 1
src/views/iosBasicData/ComputationCenter/index.vue

@@ -12,7 +12,7 @@
             <span slot="label">收付相抵</span>
             <span slot="label">收付相抵</span>
           </el-tab-pane>
           </el-tab-pane>
           <el-tab-pane label="业务单据" name="业务单据">
           <el-tab-pane label="业务单据" name="业务单据">
-            <span slot="label" style="color: #4c9e44">财务单据</span>
+            <span slot="label" style="color: #4c9e44">处理中</span>
           </el-tab-pane>
           </el-tab-pane>
           <el-tab-pane label="已完成" name="已完成"></el-tab-pane>
           <el-tab-pane label="已完成" name="已完成"></el-tab-pane>
         </el-tabs>
         </el-tabs>

+ 3 - 3
src/views/iosBasicData/writeOff/finstlbillsDetails.vue

@@ -21,7 +21,7 @@
           v-if="form.status == 3"
           v-if="form.status == 3"
           :loading="saveLoading"
           :loading="saveLoading"
           @click="allClick('撤销销账')"
           @click="allClick('撤销销账')"
-          >撤销销账
+          >撤销
         </el-button>
         </el-button>
         <el-button
         <el-button
           size="small"
           size="small"
@@ -31,7 +31,7 @@
           v-if="form.id &&form.status == 0"
           v-if="form.id &&form.status == 0"
           :loading="saveLoading"
           :loading="saveLoading"
           @click="allClick('确认销账')"
           @click="allClick('确认销账')"
-          >确认销账
+          >提交
         </el-button>
         </el-button>
         <el-button size="small" type="primary" v-if="editSave" :disabled="submitType || editPower" :loading="saveLoading" @click="editHandle"
         <el-button size="small" type="primary" v-if="editSave" :disabled="submitType || editPower" :loading="saveLoading" @click="editHandle"
           >编 辑
           >编 辑
@@ -1182,7 +1182,7 @@ export default {
           });
           });
       }
       }
       if (name == "撤销销账") {
       if (name == "撤销销账") {
-        this.$confirm("确定进行撤销销账操作?", {
+        this.$confirm("确定进行撤销操作?", {
           confirmButtonText: "确定",
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           cancelButtonText: "取消",
           type: "warning"
           type: "warning"

+ 1 - 1
src/views/iosBasicData/writeOff/index.vue

@@ -822,7 +822,7 @@ export default {
         ...Object.assign(params, this.query),
         ...Object.assign(params, this.query),
         businessType: "GZXZ",
         businessType: "GZXZ",
         status: this.activeName != 4 ? this.activeName : "",
         status: this.activeName != 4 ? this.activeName : "",
-        billStatus: this.activeName == 4 ? 1 : ""
+        billStatus: this.activeName == 4 ? 1 : this.activeName == 3?0:''
       };
       };
       this.loading = true;
       this.loading = true;
       finstlbillsList(page.currentPage, page.pageSize, obj).then(res => {
       finstlbillsList(page.currentPage, page.pageSize, obj).then(res => {

Некоторые файлы не были показаны из-за большого количества измененных файлов