修改出纳管理

src/views/iosBasicData/PaymentApplication/assembly/cashierItem.vue

@@ -89,7 +89,7 @@
       </avue-crud>
       <span slot="footer" class="dialog-footer">
         <el-button @click="dialogVisible = false" size="mini">取 消</el-button>
-        <el-button v-if="form.cashierStatus == 0" size="mini" type="success" @click="allClick('申请出纳')" >付费申请</el-button>
+        <el-button v-if="form.cashierStatus == 0" size="mini" type="success" :disabled="data.length==0" @click="allClick('申请出纳')" >付费申请</el-button>
         <el-button v-if="form.cashierStatus == 1" size="mini" type="danger" @click="allClick('撤销申请出纳')"
           >撤销付费申请</el-button
         >
@@ -212,13 +212,13 @@ export default {
             overHidden: true
           },
           {
-            label: "出纳人",
+            label: "经办人",
             prop: "cashierName",
             width: "100",
             overHidden: true
           },
           {
-            label: "出纳时间",
+            label: "经办时间",
             prop: "cashierTime",
             width: "100",
             overHidden: true

src/views/iosBasicData/cashier/components/cashierItem.vue

@@ -253,13 +253,13 @@ export default {
             overHidden: true
           },
           {
-            label: "出纳人",
+            label: "经办人",
             prop: "cashierName",
             width: "100",
             overHidden: true
           },
           {
-            label: "出纳时间",
+            label: "经办时间",
             prop: "cashierTime",
             width: "100",
             overHidden: true

src/views/iosBasicData/fininvoicesApplyfor/assembly/cashierItem.vue

@@ -97,7 +97,7 @@
       </avue-crud>
       <span slot="footer" class="dialog-footer">
         <el-button @click="dialogVisible = false" size="mini">取 消</el-button>
-        <el-button v-if="form.cashierStatus == 0" size="mini" type="success" @click="allClick('申请出纳')">收费申请</el-button>
+        <el-button v-if="form.cashierStatus == 0" size="mini" type="success" :disabled="data.length==0" @click="allClick('申请出纳')">收费申请</el-button>
         <el-button v-if="form.cashierStatus == 1" size="mini" type="danger" @click="allClick('撤销申请出纳')"
           >撤销收费申请</el-button
         >
@@ -220,13 +220,13 @@ export default {
             overHidden: true
           },
           {
-            label: "出纳人",
+            label: "经办人",
             prop: "cashierName",
             width: "100",
             overHidden: true
           },
           {
-            label: "出纳时间",
+            label: "经办时间",
             prop: "cashierTime",
             width: "100",
             overHidden: true

src/views/iosBasicData/fininvoicesOutput/assembly/cashierItem.vue

@@ -220,13 +220,13 @@ export default {
             overHidden: true
           },
           {
-            label: "出纳人",
+            label: "经办人",
             prop: "cashierName",
             width: "100",
             overHidden: true
           },
           {
-            label: "出纳时间",
+            label: "经办时间",
             prop: "cashierTime",
             width: "100",
             overHidden: true

src/views/iosBasicData/fininvoicesOutput/fininvoicesDetails.vue

@@ -133,7 +133,7 @@
                         :selectValue="form.invCurCode"
                         :filterable="true"
                         :clearable="true"
-                        :disabled="editSave"
+                        :disabled="editSave||form.srcType=='对账'"
                         :buttonIf="false"
                         placeholder="请选择发票币种"
                         :forParameter="{
@@ -417,7 +417,6 @@
                         style="width: 100%;"
                         v-model="form.yx"
                         size="small"
-                        autocomplete="off"
                         :disabled="editSave"
                         clearable
                         placeholder="请输入邮箱"
@@ -678,8 +677,8 @@
                 >转换成人民币
               </el-checkbox>
               <!-- <el-checkbox v-model="appendType" :disabled="editSave" false-label="检索" true-label="追加">追加</el-checkbox> -->
-              <el-button type="primary" size="small" :disabled="editSave" plain @click="retrievalfun(appendType)">提取费用 </el-button>
-              <el-button size="small" :disabled="tableData.length > 0" @click="ResetFilter">重置条件 </el-button>
+              <el-button type="primary" size="small" :disabled="editSave||form.srcType=='对账'" plain @click="retrievalfun(appendType)">提取费用 </el-button>
+              <el-button size="small" :disabled="tableData.length > 0||form.srcType=='对账'" @click="ResetFilter">重置条件 </el-button>
               <el-button icon="el-icon-arrow-down" type="text" size="small" v-if="!showForm" @click="showForm = true">展开</el-button>
               <el-button icon="el-icon-arrow-up" type="text" size="small" v-if="showForm" @click="showForm = false">收缩</el-button>
             </div>
@@ -687,7 +686,7 @@
         </trade-card>
         <el-card style="margin-top: 10px">
           <el-tabs v-model="activeName" @tab-click="handleClick">
-            <el-tab-pane label="查询结果" name="1">
+            <el-tab-pane label="查询结果" name="1" v-if="!(form.srcType=='对账')">
               <query-fininvoicesitems
                 ref="fininvoicesitems"
                 :queryData="queryData"
@@ -709,7 +708,7 @@
                 </template>
               </query-fininvoicesitems>
             </el-tab-pane>
-            <el-tab-pane label="选定数据" name="2">
+            <el-tab-pane label="选定数据" name="2" v-if="!(form.srcType=='对账')">
               <fininvoicesitems
                 ref="fininvoicesitems"
                 :tableData="tableData"
@@ -1931,6 +1930,9 @@ export default {
       this.pageLoading = true;
       fininvoicesDetail(id)
         .then(res => {
+          if(res.data.data.srcType=='对账'){
+            this.activeName='3'
+          }
           this.form = res.data.data;
           if (
             this.roleName.indexOf("admin") == -1

src/views/iosBasicData/fininvoicesOutput/index.vue

@@ -999,6 +999,7 @@ export default {
     newbillFun() {
       this.pageIds = [];
       this.isShow = false;
+      this.editSave=false;
       this.$store.commit("IN_FINOUT_DETAIL");
     },
     toAddEdit() {

src/views/iosBasicData/finstlbills/assembly/cashierItem.vue

@@ -98,7 +98,7 @@
       </avue-crud>
       <span slot="footer" class="dialog-footer">
         <el-button @click="dialogVisible = false" size="mini">取 消</el-button>
-        <el-button v-if="form.cashierStatus == 0" size="mini" type="success" @click="allClick('申请出纳')" :disabled="disabled"
+        <el-button v-if="form.cashierStatus == 0" size="mini" type="success" @click="allClick('申请出纳')" :disabled="disabled||data.length==0"
           >{{ form.dc == "D" ? "收费" : "付费" }}申请</el-button
         >
         <el-button v-if="form.cashierStatus == 1" size="mini" type="danger" @click="allClick('撤销申请出纳')" :disabled="disabled"
@@ -223,13 +223,13 @@ export default {
             overHidden: true
           },
           {
-            label: "出纳人",
+            label: "经办人",
             prop: "cashierName",
             width: "100",
             overHidden: true
           },
           {
-            label: "出纳时间",
+            label: "经办时间",
             prop: "cashierTime",
             width: "100",
             overHidden: true

src/views/iosBasicData/finstlbills/assembly/fininvoiceitemdetail.vue

@@ -154,7 +154,7 @@
       <el-table-column prop="amountTax" label="税额" align="center" />
       <el-table-column prop="remarks" label="备注" align="center">
         <template slot-scope="{ row }">
-          <el-input v-if="row.edit" style="width: 100%;" v-model="row.remarks" size="mini" autocomplete="off" clearable placeholder="请输入税率">
+          <el-input v-if="row.edit" style="width: 100%;" v-model="row.remarks" size="mini" autocomplete="off" clearable placeholder="请输入备注">
           </el-input>
           <span v-else>{{ row.remarks }}</span>
         </template>

src/views/iosBasicData/finstlbills/finstlbillsDetails.vue

@@ -631,7 +631,7 @@
                   <el-button size="small" type="primary" style="margin-left: 10px" :disabled="editSave" :loading="saveLoading" @click="editHandle"
                     >一键编辑
                   </el-button>
-                  <el-button size="small" type="primary" style="margin-right: 8px" :loading="saveLoading" @click="Confirminvoicefun('2')"
+                  <!-- <el-button size="small" type="primary" style="margin-right: 8px" :loading="saveLoading" @click="Confirminvoicefun('2')"
                     >不开发票
                   </el-button>
                   <el-button size="small" type="warning" style="margin-right: 8px" :loading="saveLoading" @click="Notinvoicingfun('2')"
@@ -642,7 +642,7 @@
                   </el-button>
                   <el-button size="small" type="warning" style="margin-right: 8px" :loading="saveLoading" @click="Notinvoicingfun('1')"
                     >撤销开票
-                  </el-button>
+                  </el-button> -->
                   <el-button
                     size="small"
                     type="primary"

src/views/iosBasicData/writeOff/assembly/cashierItem.vue

@@ -222,13 +222,13 @@ export default {
             overHidden: true
           },
           {
-            label: "出纳人",
+            label: "经办人",
             prop: "cashierName",
             width: "100",
             overHidden: true
           },
           {
-            label: "出纳时间",
+            label: "经办时间",
             prop: "cashierTime",
             width: "100",
             overHidden: true