Merge remote-tracking branch 'origin/dev-financial' into dev-financial

src/views/ecw/financial/creatCollection.vue

@@ -128,9 +128,9 @@
               <!-- <dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.currencyId" /> -->
             </template>
           </el-table-column>
-          <el-table-column :label="$t('税率')" align="center" prop="totalAmount">
+          <el-table-column :label="$t('税率%')" align="center" prop="totalAmount">
             <template slot-scope="scope">
-              <span>{{ scope.row.totalAmount }}{{getCurrencyLabel(scope.row.currencyId)}}</span>
+                <el-input v-model="scope.row.taxPoint" @input="changeTaxRate(scope.row,scope.$index)"></el-input>
             </template>
           </el-table-column>
           <el-table-column :label="$t('不含税金额')" align="center" prop="totalAmount">
@@ -138,9 +138,9 @@
               <span>{{ scope.row.totalAmount }}{{getCurrencyLabel(scope.row.currencyId)}}</span>
             </template>
           </el-table-column>
-          <el-table-column :label="$t('含税金额')" align="center" prop="totalAmount">
+          <el-table-column :label="$t('含税金额')" align="center" prop="taxAmount">
             <template slot-scope="scope">
-              <span>{{ scope.row.totalAmount }}{{getCurrencyLabel(scope.row.currencyId)}}</span>
+              <span>{{ scope.row.taxAmount }}{{getCurrencyLabel(scope.row.currencyId)}}</span>
 
               <!-- <dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.currencyId" /> -->
             </template>
@@ -422,21 +422,6 @@
       <el-button plain type="primary" @click="$store.dispatch('tagsView/delCurrentView')">{{$t('返回')}}</el-button>
       <!-- <el-button type="primary" :loading="saveBtnLoading" @click="submitForm(0)">{{ id&&form.state!=0 ? $t('修改') : $t('新增收款单') }}</el-button> -->
     </div>
-    <el-dialog
-      :title="$t('提示')"
-      :visible.sync="dialogVisible"
-      width="30%">
-      <span class="cancel_notice">{{$t('拆单申请正在审核中，你确定取消拆单申请吗？')}}</span>
-      <div class="cancel_content">
-        <span>{{$t('取消原因：')}}</span>
-        <el-input v-model="reason" :placeholder="$t('请输入取消原因')"></el-input>
-      </div>
-
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="dialogVisible = false">{{$t('取消')}}</el-button>
-        <el-button type="primary" @click="cancelSplit">{{$t('确定')}}</el-button>
-      </span>
-    </el-dialog>
     <el-dialog
       :visible.sync="open"
       :title="$t('添加未收客户款项')"
@@ -772,6 +757,11 @@ export default {
     if (that.$route.query.orderId) {
       await getFirstReceivableListByOrderId({id:that.$route.query.orderId}).then(response => {
         this.list = [...response.data]
+        this.list.map(v=>{
+          if(v.taxPoint==0){
+            v.taxAmount = v.totalAmount
+          }
+        })
         getOrder(that.$route.query.orderId).then(response => {
           // console.log(response.data)
           if(response.data.customerId) this.$set(this.form,'customerId',response.data.customerId)
@@ -788,6 +778,11 @@ export default {
       })
       await getInvoicingItem({ id: this.id }).then(res => {
         this.list = [...res.data]
+        this.list.map(v=>{
+          if(v.taxPoint==0){
+            v.taxAmount = v.totalAmount
+          }
+        })
       })
       getReceiptAccountList({ id: this.id }).then(res => {
         if (res.data.length > 0) {
@@ -826,6 +821,11 @@ export default {
       this.receiptId = this.$route.query.receiptId;
       getReceivableInfoByIds({ id: this.receiptId }).then(res => {
         this.list = [{...res.data}]
+        this.list.map(v=>{
+          if(v.taxPoint==0){
+            v.taxAmount = v.totalAmount
+          }
+        })
         this.calculation()
 
           getOrder(res.data.orderId).then(response => {
@@ -959,6 +959,17 @@ export default {
         this.$set(this.form, 'receiptAccountList', [...this.form.receiptAccountList])
       }, 100)
     },
+    //明细改变税率
+    changeTaxRate(row,index){
+      var regs=/^\d+$/;
+      if(row.taxPoint&&!regs.test(row.taxPoint)){
+        row.taxPoint = 0
+        this.$modal.msgError(this.$t('输入税率格式不对'));
+      }
+      row.taxAmount = row.totalAmount*(1+row.taxPoint/100).toFixed(2)
+      this.list[index] = {...row}
+      this.$set(this,'list',this.list)
+    },
     calculation() {
       const copyList = this.form.receiptAccountList
       this.form.receiptAccountList = []

src/views/ecw/financial/receiptDetail.vue

@@ -259,13 +259,13 @@
         </el-table-column>
         <el-table-column :label="$t('操作')" align="center" width="200">
           <template slot-scope="scope">
-            <el-button v-if="scope.row.status == 0" v-hasPermi="['ecw:payment:detail:delete']" type="text" @click="deleteClick(scope.row)">{{ $t('删除') }}</el-button>
+            <el-button v-if="scope.row.status == 0 || scope.row.status == 1" v-hasPermi="['ecw:payment:detail:delete']" type="text" @click="deleteClick(scope.row)">{{ $t('删除') }}</el-button>
             <el-button v-if="scope.row.status == 0" type="text" @click="detailClick(scope.row)" v-hasPermi="['ecw:payment:detail:detail']">{{ $t('详情') }}</el-button>
             <el-button v-if="scope.row.status == 0" type="text" @click="$router.push(`bankDetail?id=`+id+`&bankId=`+scope.row.id)" v-hasPermi="['ecw:payment:detail:writeOff']">{{ $t('核销') }}</el-button>
             <el-button v-if="scope.row.status == 1" type="text" @click="showCancel(scope.$index)" v-hasPermi="['ecw:payment:detail:cancelWriteOff']">{{ $t('反核销') }}</el-button>
             <el-button v-if="scope.row.status == 0" type="text" @click="editClick(scope.row)" v-hasPermi="['ecw:payment:detail:bankEdit']">{{ $t('编辑') }}</el-button>
             <el-button v-if="scope.row.status == 2" type="text" @click="cancelClick(scope.$index,1)" v-hasPermi="['ecw:payment:detail:cancelDetailApproval']">{{ $t('取消审核') }}</el-button>
-             <el-button v-if="scope.row.status == 3" type="text" @click="cancelClick(scope.$index,2)" v-hasPermi="['ecw:payment:detail:cancelWriteOff']">{{ $t('取消反核销审核') }}</el-button>
+             <el-button v-if="scope.row.status == 3" type="text" @click="cancelClick(scope.$index,2)" v-hasPermi="['ecw:payment:detail:cancelWriteOffNo']">{{ $t('取消反核销审核') }}</el-button>
             <el-button v-if="scope.row.status == 3 || scope.row.status == 2" type="text"  @click="$router.push(`/bpm/process-instance/detail?id=`+scope.row.bmpId)" v-hasPermi="['ecw:payment:detail:writeOff']">{{ $t('审核详情') }}</el-button>
           </template>
         </el-table-column>
@@ -857,15 +857,17 @@ export default {
       var receiptItemId = this.detailed[this.selectIndex].id
       if(this.cancelType==1){
         cancelFinanceReceiptItemWriteOff({receiptItemId:receiptItemId,remark:this.cancelReason}).then(res=>{
-          this.$message.success(this.$t("提交成功"));
           this.cancelShow = false
           this.getList()
+          this.$message.success(this.$t("提交成功"));
+
         });
       }else{
         cancelFinanceReceiptItemWriteOffNo({receiptItemId:receiptItemId,remark:this.cancelReason}).then(res=>{
-          this.$message.success(this.$t("提交成功"));
           this.cancelShow = false
           this.getList()
+          this.$message.success(this.$t("提交成功"));
+
         });
       }
 
@@ -978,6 +980,7 @@ export default {
         .confirm(this.$t('您确认要反核销吗')+'?')
         .then(()=>{
           financeReceiptItemWriteOffNo({receiptId:this.id,receiptNo:this.form.receiptNo,receiptItemId:id,remark:this.reason}).then(res=>{
+              this.getList();
               this.$message.success(this.$t("提交成功"));
               this.dialogVisible = false
             });
@@ -1015,7 +1018,7 @@ export default {
       this.$modal
         .confirm(this.$t('您确认要全部核销吗'+'?'))
         .then(() => {
-          return financeReceiptWriteOff({receiptId:this.id,receiptNo:form.receiptNo});
+          return financeReceiptWriteOff({receiptId:this.id,receiptNo:this.form.receiptNo});
         })
         .then(() => {
           this.$modal.msgSuccess(this.$t('核销成功'));

src/views/ecw/financial/voucher.vue

@@ -175,7 +175,7 @@
           <el-button
             size="mini"
             type="text"
-            v-if="scope.row.state == 9 || scope.row.state == 7 || scope.row.state == 11"
+            v-if="scope.row.state == 9 || scope.row.state == 7 || scope.row.state == 11|| scope.row.state == 10"
             v-hasPermi="['ecw:voucher:cancelWriteOff']"
             @click="$router.push(`/bpm/process-instance/detail?id=`+scope.row.bmpId)"
             >{{ $t('审核详情') }}</el-button
@@ -418,21 +418,24 @@ export default {
       var receiptId = this.list[this.selectIndex].id
       if(this.cancelIndex==1){
             cancelFinanceReceiptApproval({receiptId:receiptId,remark:this.cancelReason}).then(res=>{
-              this.$message.success(this.$t("提交成功"));
               this.cancelShow = false
               this.getList();
+              this.$message.success(this.$t("提交成功"));
+
             });
       }else if(this.cancelIndex ==2){
           cancelFinanceReceiptApprovalNo({receiptId:receiptId,remark:this.cancelReason}).then(res=>{
-            this.$message.success(this.$t("提交成功"));
             this.cancelShow = false
             this.getList();
+            this.$message.success(this.$t("提交成功"));
+
           });
       }else{
           cancelFinanceReceiptWriteOffNo({receiptId:receiptId,remark:this.cancelReason}).then(res=>{
-            this.$message.success(this.$t("提交成功"));
             this.cancelShow = false
             this.getList();
+            this.$message.success(this.$t("提交成功"));
+
           });
       }
 
@@ -448,6 +451,7 @@ export default {
           .confirm(this.$t('您确认要反审核吗')+'?')
           .then(()=>{
             financeApproveNo({receiptId:receiptIdData.id,receiptNo:receiptIdData.receiptNo,remark:this.reason}).then(res=>{
+              this.getList();
               this.$message.success(this.$t("提交成功"));
               this.dialogVisible = false
               // this.$store.dispatch('tagsView/delCurrentView')
@@ -459,6 +463,7 @@ export default {
           .confirm(this.$t('您确认要反核销吗')+'?')
           .then(()=>{
             financeReceiptWriteOffNo({receiptId:receiptIdData.id,receiptNo:receiptIdData.receiptNo,remark:this.reason}).then(res=>{
+              this.getList();
               this.$message.success(this.$t("提交成功"));
               this.dialogVisible = false
               // this.$store.dispatch('tagsView/delCurrentView')