Browse Source

no message

ly 1 year ago
parent
commit
aac998afbd
2 changed files with 33 additions and 19 deletions
  1. 2 2
      src/views/business/invoice/ContractChoice.vue
  2. 31 17
      src/views/business/invoice/form.vue

+ 2 - 2
src/views/business/invoice/ContractChoice.vue

@@ -1,5 +1,5 @@
 <template>
-    <el-dialog v-model="visible" width="680px" append-to-body draggable :close-on-click-modal="false">
+    <el-dialog v-model="visible" width="50%" append-to-body draggable :close-on-click-modal="false">
         <template #header>
             <div class="dialog-title-container">
                 <span class="title-label" style="color: white"><i class="el-icon-document" style="color: white" />
@@ -34,7 +34,7 @@
                 <el-table-column v-if="multiple" type="selection" width="40" align="center" />
                 <el-table-column type="index" label="序号" width="46" align="center" />
                 <el-table-column label="合同编号" prop="contractNo" width="100" align="center" />
-                <el-table-column label="客户名称" prop="companyName" width="100" align="center" />
+                <el-table-column label="客户名称" prop="companyName" width="200" align="center" />
                 <el-table-column label="备注" prop="remark" header-align="center" />
                 <el-table-column v-if="!multiple" label="操作" width="50" align="center">
                     <template #default="scope">

+ 31 - 17
src/views/business/invoice/form.vue

@@ -64,6 +64,12 @@
                                 </span>
                             </el-form-item>
                         </el-col>
+                        <el-col :span="12" v-if="form.refuseReason != null && form.refuseReason != '' && 
+                        (form.status == 1|| form.status == 0)">
+                            <el-form-item label="退回原因" prop="refuseReason">
+                                <span>{{form.refuseReason}}</span>
+                            </el-form-item>
+                        </el-col>
                     </el-row>
                     <el-row :gutter="30">
                         <el-col :span="6">
@@ -87,8 +93,8 @@
                         </el-col>
                         <el-col :span="6">
                             <el-form-item label="申请开票金额: " prop="allowInvoiceAmount">
-                                <el-input v-if="editStatus" v-model="form.allowInvoiceAmount" placeholder="申请开票金额"
-                                    size="small">
+                                <el-input v-if="editStatus" v-model.number="form.allowInvoiceAmount"
+                                    placeholder="申请开票金额" size="small">
                                     <template #append>元</template>
                                 </el-input>
                                 <span v-else>{{ form.allowInvoiceAmount + "元"}}</span>
@@ -105,13 +111,13 @@
                             </el-form-item>
                         </el-col>
                         <el-col :span="6">
-                            <el-form-item label="开票方:" prop="invoiceMy" required>
+                            <el-form-item label="开票方:" prop="invoiceMy">
                                 <el-input v-if="editStatus" v-model="form.invoiceMy" placeholder="开票方" size="small" />
                                 <span v-else>{{ form.invoiceMy }}</span>
                             </el-form-item>
                         </el-col>
                         <el-col :span="6">
-                            <el-form-item label="社会信用代码:" prop="myCreditSocietyCode" required>
+                            <el-form-item label="社会信用代码:" prop="myCreditSocietyCode">
                                 <el-input v-if="editStatus" v-model="form.myCreditSocietyCode" placeholder="社会信用代码"
                                     size="small" />
                                 <span v-else>{{ form.myCreditSocietyCode }}</span>
@@ -132,14 +138,14 @@
                             </el-form-item>
                         </el-col>
                         <el-col :span="6">
-                            <el-form-item label="收票方:" prop="invoiceOther" required>
+                            <el-form-item label="收票方:" prop="invoiceOther">
                                 <el-input v-if="editStatus" v-model="form.invoiceOther" placeholder="请输入收票方"
                                     size="small" />
                                 <span v-else>{{ form.invoiceOther }}</span>
                             </el-form-item>
                         </el-col>
                         <el-col :span="6">
-                            <el-form-item label="社会信用代码:" prop="otherCreditSocietyCode" required>
+                            <el-form-item label="社会信用代码:" prop="otherCreditSocietyCode">
                                 <el-input v-if="editStatus" v-model="form.otherCreditSocietyCode" size="small"
                                     placeholder="社会信用代码" />
                                 <span v-else>{{ form.otherCreditSocietyCode }}</span>
@@ -231,7 +237,7 @@
                 <el-row :gutter="30">
                     <el-col :span="12">
                         <el-form-item label="拒绝原因" prop="refuseReason">
-                            <el-input 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>
@@ -248,7 +254,7 @@
                 <el-row :gutter="30">
                     <el-col :span="12">
                         <el-form-item label="退回原因" prop="refuseReason">
-                            <el-input 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>
@@ -259,7 +265,7 @@
             </template>
         </el-dialog>
 
-        <el-dialog title="开票审核通过" v-model="passFlag" width="50%" append-to-body draggable :close-on-click-modal="false">
+        <el-dialog title="开票审核通过" v-model="passFlag" width="70%" append-to-body draggable :close-on-click-modal="false">
             <el-form ref="formRef" :model="form" :rules="passRules" label-width="100px">
                 <el-row :gutter="30">
                     <el-col :span="8">
@@ -267,11 +273,7 @@
                             <span>{{ form.invoiceOther }}</span>
                         </el-form-item>
                     </el-col>
-                    <el-col :span="6">
-                        <el-form-item label="社会信用代码" label-width="120px" prop="otherCreditSocietyCode">
-                            <span>{{ form.otherCreditSocietyCode }}</span>
-                        </el-form-item>
-                    </el-col>
+       
                     <el-col :span="6">
                         <el-form-item label="申请开票金额 " prop="allowInvoiceAmount">
                             <span>{{ form.allowInvoiceAmount }}</span>
@@ -282,13 +284,21 @@
                             <span>{{useUserStore().user.nickName }}</span>
                         </el-form-item>
                     </el-col>
-                    <el-col :span="10">
+             
+                </el-row>
+                <el-row :gutter="30">
+                    <el-col :span="8">
                         <el-form-item label="开票时间 " prop="invoiceTime">
                             <el-date-picker v-model.trim="form.invoiceTime" size="small" :clearable="true"
                                 style="width: 100%" format="YYYY-MM-DD" value-format="YYYY-MM-DD" align="center"
                                 type="date" placeholder="开票时间" />
                         </el-form-item>
                     </el-col>
+                    <el-col :span="14">
+                        <el-form-item label="社会信用代码"    prop="otherCreditSocietyCode">
+                            <span>{{ form.otherCreditSocietyCode }}</span>
+                        </el-form-item>
+                    </el-col>
                 </el-row>
                 <el-col :span="24">
                     <div class="details-btns-container">
@@ -364,9 +374,13 @@
         form: {},
         rules: {
             invoiceMy: [{ required: true, trigger: "blur", message: "请输入开票方" }],
-            myCreditSocietyCode: [{ required: true, trigger: "blur", message: "请输入社会信用代码" }],
+            myCreditSocietyCode: [{ required: true, max: 18, min: 18, message: "社会信用代码为18位", trigger: "blur" }],
             invoiceOther: [{ required: true, trigger: "blur", message: "请输入请输入收票方" }],
-            otherCreditSocietyCode: [{ required: true, trigger: "blur", message: "请输入社会信用代码" }],
+            otherCreditSocietyCode: [{ required: true, max: 18, min: 18, message: "社会信用代码为18位", trigger: "blur" }],
+            allowInvoiceAmount: [
+                { required: true, type: 'number', message: '请输入正确数据', trigger: 'blur' }
+            ],
+            invoiceType: [{ required: true, trigger: "change", message: "请选择发票类型" }],
         },
         returnRules: {
             refuseReason: [{ required: true, trigger: "blur", message: "请输入退回原因" }],