Browse Source

开票作废申请原因必填

wucl 10 tháng trước cách đây
mục cha
commit
ffa26df2d6
2 tập tin đã thay đổi với 33 bổ sung116 xóa
  1. 2 2
      src/views/complex/index.vue
  2. 31 114
      src/views/major/myOrder.vue

+ 2 - 2
src/views/complex/index.vue

@@ -1190,9 +1190,9 @@ export default {
     },
     openAssetsDeclare() {
       if (this.hasOpenBar) {
-        this.$router.push({ path: '/income/major/declare/market', query: {} });
+        this.$router.push({ path: '/income/assets/declare/market', query: {} });
       } else {
-        this.$router.push({ path: '/income/major/declare/evaluate', query: {} });
+        this.$router.push({ path: '/income/assets/declare/evaluate', query: {} });
       }
     },
     assetsDeclareCheck(row) {

+ 31 - 114
src/views/major/myOrder.vue

@@ -267,97 +267,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <!-- <el-divider content-position="left">银行信息</el-divider>
-        <el-row>
-          <el-col :xs="24" :sm="12" :lg="12" :span="6">
-            <el-form-item label="开户行:" prop="bankName" label-width="140px" class="postInfo-container-item">
-              <el-input v-model.trim="invoice.bankName" class="filter-item" />
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6" :span="6">
-            <el-form-item label="银行账号:" prop="bankAccount" label-width="140px" class="postInfo-container-item">
-              <el-input v-model.trim="invoice.bankAccount" class="filter-item" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :xs="24" :sm="12" :lg="12" :span="6">
-            <el-form-item label="地址:" prop="bankAddress" label-width="140px" class="postInfo-container-item">
-              <el-input v-model.trim="invoice.bankAddress" class="filter-item" />
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6" :span="6">
-            <el-form-item label="电话:" prop="bankTel" label-width="140px" class="postInfo-container-item">
-              <el-input v-model.trim="invoice.bankTel" class="filter-item" />
-            </el-form-item>
-          </el-col>
-        </el-row> -->
-        <!-- <el-divider content-position="left">发票信息</el-divider>
-        <el-row>
-          <el-col :xs="24" :sm="12" :lg="12" :span="6">
-            <el-form-item label="发票号码:" prop="ticketNo" label-width="140px" class="postInfo-container-item">
-              <el-input :value="invoice.ticketNo" class="filter-item"  readonly disabled/>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="12" :span="6">
-            <el-form-item label="实开金额(元):" prop="realAmount" label-width="140px" class="postInfo-container-item">
-              <el-input :value="invoice.realAmount" class="filter-item" readonly disabled/>
-            </el-form-item>
-          </el-col>
-         
-        </el-row>
-        <el-row>
-          <el-col :xs="24" :sm="12" :lg="12" :span="6">
-            <el-form-item label="申请日期:" prop="created" label-width="140px" class="postInfo-container-item">
-              <el-input :value="invoice.created" class="filter-item" readonly disabled/>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="12" :span="6">
-            <el-form-item label="实开日期:" prop="realMakeDate" label-width="140px" class="postInfo-container-item">
-              <el-input :value="invoice.realMakeDate" class="filter-item" readonly disabled/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :xs="24" :sm="12" :lg="12" :span="6">
-            <el-form-item label="订单类型:" prop="businessType" label-width="140px" class="postInfo-container-item">
-              <el-input :value="invoice.businessType" class="filter-item" readonly disabled/>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="12" :span="6">
-            <el-form-item label="开票人:" prop="applyName" label-width="140px" class="postInfo-container-item">
-              <el-input :value="invoice.applyName" class="filter-item" readonly disabled/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :xs="24" :sm="12" :lg="12" :span="6">
-            <el-form-item label="订单编号:" prop="orderId" label-width="140px" class="postInfo-container-item">
-              <el-input :value="invoice.orderId" class="filter-item" readonly disabled/>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="12" :span="6">
-            <el-form-item label="产品号:" prop="productionNo" label-width="140px" class="postInfo-container-item">
-              <el-input :value="invoice.productionNo" class="filter-item" readonly disabled/>
-            </el-form-item>
-          </el-col>
-        </el-row> -->
-       
-        <!-- <el-row>
-          <el-col :xs="24" :sm="12" :lg="6" :span="6">
-            <el-form-item label="税点:" prop="taxRate" label-width="140px" class="postInfo-container-item">
-              <el-input-number :precision="2" :min="0" :value-on-clear="0" v-model.number="invoice.taxRate" type="number"
-                style="width:206px" class="filter-item" />
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6" :span="6">
-            <el-form-item label="税额:" prop="taxAmount" label-width="140px" class="postInfo-container-item">
-              <el-input-number :precision="2" :min="0" :value-on-clear="0" v-model.number="invoice.taxAmount"
-                type="number" style="width:206px" class="filter-item" />
-            </el-form-item>
-          </el-col>
-        </el-row> -->
-       
       </el-form>
       <span slot="footer" class="dialog-footer">
         <el-button @click="newInvoiceDialog = false">取 消</el-button>
@@ -1070,32 +979,40 @@ export default {
       this.newInvoiceDialog = true;
     },
     cancellation(id) {
-            this.$prompt('作废原因:','已开发票作废',{
+         const h = this.$createElement
+            this.$prompt(
+              h('p', null, [h('span', { style: 'color: red' }, '请输入作废原因:')]),'开票作废',{
               confirmButtonText: '确认',
               cancelButtonText: '取消',
-              type: 'warning',
+              type: 'error',
+              inputValidator: (value) => { 
+                if (!value) {
+                  return '作废原因不能为空'
+                }
+              },
           }).then(({value}) => {
-                this.invoice.reason = value;
-                this.invoice.id = id;
-                this.$api.financeInvoice.cancellation(this.invoice).then(res => {
-                    if (res.code === 200 && res.data) {
-                        this.$notify({
-                            title: '成功',
-                            message: '作废申请已提交',
-                            type: 'success',
-                            duration: 2000
-                        });
-                        this.getFinanceInvoiceList();
-                    } else {
-                        this.$notify({
-                            title: '失败',
-                            message: '作废提交失败',
-                            type: 'error',
-                            duration: 2000
-                        });
-                    }
-                })
-            })
+            this.invoice.reason = value;
+            this.invoice.id = id;
+            this.$api.financeInvoice.cancellation(this.invoice).then(res => {
+              if (res.code === 200 && res.data) {
+                  this.$notify({
+                      title: '成功',
+                      message: '作废申请已提交',
+                      type: 'success',
+                      duration: 2000
+                  });
+                  this.getFinanceInvoiceList();
+              } else {
+                  this.$notify({
+                      title: '失败',
+                      message: '作废提交失败',
+                      type: 'error',
+                      duration: 2000
+              });
+            }
+          })
+            
+          })
         },
     openApplyOutWarehouseList(row) {
       console.log(row)