ly 1 год назад
Родитель
Сommit
4fb25a11d6
2 измененных файлов с 17 добавлено и 10 удалено
  1. 1 1
      src/api/business/invoice.js
  2. 16 9
      src/views/business/invoice/form.vue

+ 1 - 1
src/api/business/invoice.js

@@ -67,6 +67,6 @@ export function exportInfo(query) {
     {
       ...query,
     },
-    `委托订单导出_${new Date().getTime()}.xlsx`
+    `发票数据导出_${new Date().getTime()}.xlsx`
   )
 }

+ 16 - 9
src/views/business/invoice/form.vue

@@ -17,8 +17,8 @@
                         <el-button v-show="form.id && editStatus" type="info" size="small" icon="Close"
                             style="margin-left: 10px;" @click="editStatus = false">取消编辑</el-button>
                         <div v-hasPermi="['business:invoice:edit']">
-                            <el-button v-show="!editStatus && (form.status == 0|| form.status == 4)" type="warning" size="small" icon="Edit"
-                                @click="editStatus = true">编辑</el-button>
+                            <el-button v-show="!editStatus && (form.status == 0|| form.status == 4)" type="warning"
+                                size="small" icon="Edit" @click="editStatus = true">编辑</el-button>
 
                         </div>
 
@@ -237,7 +237,8 @@
                 <el-row :gutter="30">
                     <el-col :span="12">
                         <el-form-item label="拒绝原因" prop="refuseReason">
-                            <el-input :autosize="{ minRows: 2, maxRows: 4 }" type="textarea"  v-model="form.refuseReason" placeholder="请输入拒绝原因" size="small" />
+                            <el-input :autosize="{ minRows: 2, maxRows: 4 }" type="textarea" v-model="form.refuseReason"
+                                placeholder="请输入拒绝原因" size="small" />
                         </el-form-item>
                     </el-col>
                 </el-row>
@@ -254,7 +255,8 @@
                 <el-row :gutter="30">
                     <el-col :span="12">
                         <el-form-item label="退回原因" prop="refuseReason">
-                            <el-input  :autosize="{ minRows: 2, maxRows: 4 }" type="textarea" v-model="form.refuseReason" placeholder="请输入退回原因" size="small" />
+                            <el-input :autosize="{ minRows: 2, maxRows: 4 }" type="textarea" v-model="form.refuseReason"
+                                placeholder="请输入退回原因" size="small" />
                         </el-form-item>
                     </el-col>
                 </el-row>
@@ -273,7 +275,7 @@
                             <span>{{ form.invoiceOther }}</span>
                         </el-form-item>
                     </el-col>
-       
+
                     <el-col :span="6">
                         <el-form-item label="申请开票金额 " prop="allowInvoiceAmount">
                             <span>{{ form.allowInvoiceAmount }}</span>
@@ -284,7 +286,7 @@
                             <span>{{useUserStore().user.nickName }}</span>
                         </el-form-item>
                     </el-col>
-             
+
                 </el-row>
                 <el-row :gutter="30">
                     <el-col :span="8">
@@ -295,7 +297,7 @@
                         </el-form-item>
                     </el-col>
                     <el-col :span="14">
-                        <el-form-item label="社会信用代码"    prop="otherCreditSocietyCode">
+                        <el-form-item label="社会信用代码" prop="otherCreditSocietyCode">
                             <span>{{ form.otherCreditSocietyCode }}</span>
                         </el-form-item>
                     </el-col>
@@ -380,7 +382,7 @@
             allowInvoiceAmount: [
                 { required: true, type: 'number', message: '请输入正确数据', trigger: 'blur' }
             ],
-            invoiceContent:[
+            invoiceContent: [
                 { required: true, trigger: "change", message: "请选择开票内容" }
             ],
             invoiceType: [{ required: true, trigger: "change", message: "请选择发票类型" }],
@@ -565,7 +567,12 @@
         }
         proxy.$refs["invoiceRef"].validate(valid => {
             if (valid) {
-                form.value.status = status
+                if (form.value.status == 4 && status == 0) {
+                    form.value.status = 4
+                } else {
+                    form.value.status = status
+                }
+
                 if (form.value.id != null) {
                     updateInvoice(form.value).then(response => {
                         proxy.$modal.msgSuccess("修改成功");