Browse Source

Merge remote-tracking branch 'origin/mergeBranch' into mergeBranch

qymljy 2 years ago
parent
commit
79086f39d5

+ 22 - 11
src/HDrpManagement/invoiceapp/detail/detail.vue

@@ -19,7 +19,7 @@
       <div slot="customOperation" >
         <el-button v-if="tool.checkAuth($route.name,'submit')" type="primary" size="mini" @click="submitInvoice" :disabled="mainData.status !== '新建' && mainData.status !== '提交'">{{mainData.status ==='新建'?'提交':'撤回'}}</el-button>
         <el-button v-if="tool.checkAuth($route.name,'check')" type="primary" size="mini" @click="checkInvoice" :disabled="mainData.status !== '提交' && mainData.status !== '审核'">{{mainData.status === '审核'?'反审核':'审核'}}</el-button>
-        <el-button type="primary" size="mini" class="inline-16" :disabled="mainData.byhand === 1" @click="toManual">转手工</el-button>
+        <el-button v-if="tool.checkAuth($route.name,'toManual')" type="primary" size="mini" class="inline-16" :disabled="mainData.byhand === 1 || mainData.status !== '新建'" @click="toManual">转手工</el-button>
       </div>
       <div slot="slot0" >
         <invoiceOrder :status="mainData.status" :sys_enterpriseid="mainData.sys_enterpriseid"></invoiceOrder>
@@ -178,16 +178,27 @@ export default {
         });          
       });
     },
-    async toManual () {
-      const res = await this.$api.requested({
-        "id": "20221228150403",
-        "content": {
-          "sa_invoiceapplyid":this.$route.query.id
-        }
-      })
-      this.tool.showMessage(res,()=>{
-        this.queryMainData()
-      })
+    toManual () {
+      this.$confirm('确认要转手工吗?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(async () => {
+        const res = await this.$api.requested({
+          "id": "20221228150403",
+          "content": {
+            "sa_invoiceapplyid":this.$route.query.id
+          }
+        })
+        this.tool.showMessage(res,()=>{
+          this.queryMainData()
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        });          
+      });
     }
   },
   mounted () {

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

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-button-group style="margin-bottom:10px">
-      <el-button size="small" type="primary" @click="addInvoiceapp">一键添加发票</el-button>
+      <el-button size="small" type="primary" :disabled="status !== '新建'" @click="addInvoiceapp">一键添加发票</el-button>
       <el-button size="small" type="primary" :disabled="selectData.length === 0" @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">红冲勾选行</el-button>

+ 1 - 1
src/components/normal-basic-layout/details/modules/datalog/index.vue

@@ -9,7 +9,7 @@
           v-for="(activity, index) in list"
           :key="index"
           :timestamp="activity.actiondate">
-          {{activity.remarks}}
+          {{activity.actionby}}&nbsp;-&nbsp;{{activity.action}}&nbsp;-&nbsp;{{activity.remarks}}
         </el-timeline-item>
       </el-timeline>
     </div>