zhangqiOMG 2 years ago
parent
commit
0abe6f77f2

+ 3 - 3
src/HDrpManagement/invoiceapp/detail/tab/blueInvoice/index.vue

@@ -3,9 +3,9 @@
     <el-button-group v-if="tool.checkAuth($route.name,'editBlueInvioce')" style="margin-bottom:10px">
       <el-button size="small" type="primary" :disabled="data.status !== '新建'" @click="addInvoiceapp">一键添加发票</el-button>
       <el-button size="small" type="primary" :disabled="data.status !== '新建'" @click="addInvoiceapp2">添加发票</el-button>
-      <el-button size="small" type="primary" :disabled="selectData.length === 0 && data.status != '审核'" @click="clickCreateBlueInvioce">勾选创建发票</el-button>
-      <el-button size="small" type="primary" :disabled="selectData.length === 0" @click="clickInvioceQuery">发票创建查询</el-button>
-      <el-button size="small" type="primary" :disabled="selectData.length === 0 &&  data.status != '审核'" @click="blueInvioceToRed">红冲勾选行</el-button>
+      <el-button size="small" type="primary" :disabled="selectData.length === 0 || data.status !== '审核' || data.byhand !== 0" @click="clickCreateBlueInvioce">勾选创建发票</el-button>
+      <el-button size="small" type="primary" :disabled="selectData.length === 0 || data.status !== '审核' || data.byhand !== 0" @click="clickInvioceQuery">发票创建查询</el-button>
+      <el-button size="small" type="primary" :disabled="selectData.length === 0 ||  data.status !== '审核'" @click="blueInvioceToRed">红冲勾选行</el-button>
     </el-button-group>
     <invoiceTable :data="data" ref="invoiceTable" @activeRow="activeRow" @selection="selection"></invoiceTable>
     <invoiceTablemx :status="data.status" ref="invoiceTablemx" @onSuccess="mxOnSuccess"></invoiceTablemx>

+ 1 - 1
src/HDrpManagement/invoiceapp/detail/tab/invoiceOrder/components/addorderline.vue

@@ -97,7 +97,7 @@ export default {
                 "sa_invoiceapply_orderid": 0, 
                 "saorderid": row.sa_orderid, 
                 "sa_orderitemsid": row.sa_orderitemsid, 
-                "price": "10.000000", 
+                "price": row.price, 
                 "invoiceamount": 0, 
                 "invoiceaqty": 0
               }

+ 1 - 0
src/HDrpManagement/orderManage/modules/edit.vue

@@ -431,6 +431,7 @@ export default {
     },
     // 选择结算企业
     onSelect (data) {
+      console.log(data)
       this.financiallist = data.finance
       data.finance.forEach(e => {
         if (e.isdefault === 1) {

+ 12 - 0
src/views/login/login.vue

@@ -142,6 +142,12 @@ export default {
             return e
           }
         })
+        let inactive = res.account_list.map(e=>{
+          if (e.status === 'INACTIVE') {
+            return e
+          }
+        })
+        sessionStorage.setItem('inactaccount',JSON.stringify(inactive))
         sessionStorage.setItem('account_list',JSON.stringify(res.account_list))
         sessionStorage.setItem('active_account',JSON.stringify(res.account_list[0]))
         this.basicData.query_userauth().then(()=>{
@@ -183,6 +189,12 @@ export default {
             return e
           }
         })
+        let inactive = res.account_list.map(e=>{
+          if (e.status === 'INACTIVE') {
+            return e
+          }
+        })
+        sessionStorage.setItem('inactaccount',JSON.stringify(inactive))
         sessionStorage.setItem('account_list',JSON.stringify(res.account_list))
 
         sessionStorage.setItem('active_account',JSON.stringify(res.account_list[0]))