src/components/AcceptorSelect/AcceptorSelect.vue

@@ -31,6 +31,7 @@ export default {
   data() {
     return {
       filter: {
+        status:5, // 已删除的承兑人不展示
         pageIndex: 1,
         pageSize: 100
       },

src/components/BillForm/BillForm.vue

@@ -3,6 +3,7 @@
     <div
     v-for="(item, index) in contractDrafts"
     :key="index"
+    v-if="item.draftStatus != 1"
     >
 
       <el-row class="form-container-items">
@@ -85,10 +86,10 @@
         <!-- 承兑日期 -->
         <el-col :span="colSpan">
           <el-form-item label="承兑日期"
-          :prop="'contractDrafts.' + index + '.issueDate'"
-          :rules="rules.issueDate">
+          :prop="'contractDrafts.' + index + '.acceptDate'"
+          :rules="rules.acceptDate">
             <el-date-picker
-              v-model="item.issueDate"
+              v-model="item.acceptDate"
               type="date"
               placeholder="选择日期"
               value-format="yyyy-MM-dd"
@@ -131,10 +132,10 @@
         <!-- 出票日期 -->
         <el-col :span="colSpan">
           <el-form-item label="出票日期"
-          :prop="'contractDrafts.' + index + '.acceptDate'"
-          :rules="rules.acceptDate">
+          :prop="'contractDrafts.' + index + '.issueDate'"
+          :rules="rules.issueDate">
             <el-date-picker
-              v-model="item.acceptDate"
+              v-model="item.issueDate"
               type="date"
               placeholder="选择日期"
               value-format="yyyy-MM-dd"
@@ -201,8 +202,8 @@
         <!-- 利率 -->
         <el-col :span="colSpan">
           <el-form-item label="附件"
-           :rules="rules.acceptDate"
-          :prop="'contractDrafts.' + index + '.picUrls'">
+           :rules="rules.picUrls"
+           :prop="'contractDrafts.' + index + '.picUrls'">
             <FileUpload
             v-model="item.picUrls"
             accept=".jpg, .jpeg, .png, .pdf"

src/components/DrawerSelect/DrawerSelect.vue

@@ -31,6 +31,7 @@ export default {
   data() {
     return {
       filter: {
+        status:5, // 已删除的出票人不展示
         pageIndex: 1,
         pageSize: 100
       },

src/views/contracts/detail.vue

@@ -62,11 +62,14 @@
           <!-- 审核反馈和审核截图框  -->
           <div class="yusa">
             <el-col :xs="24" :sm="24" :md="14" :lg="14" :xl="10" class="jas">
-              <el-form ref="form" :model="feed" label-width="0px">
+              <el-form ref="form" :model="contract" label-width="0px">
                 <span class="sah">审核反馈：</span>
                 <el-form-item label="">
-                  <el-input v-if="role === 1" v-model="feed.feedback" type="textarea" />
-                  <div v-else>{{ feed.feedback }}</div>
+                  <el-input
+                  v-permission="['salesman', 'admin']"
+                  v-model="contract.feedback"
+                  type="textarea" />
+                  <div v-permission="['supplier']">{{ contract.feedback }}</div>
                 </el-form-item>
               </el-form>
             </el-col>
@@ -75,13 +78,13 @@
               <div style="display: flex; justify-content: flex-end">
                 <div class="imgbox">
                   <FileUpload
-                  v-if="role === 1"
-                  v-model="feed.feedbackPicList"
+                  v-permission="['salesman', 'admin']"
+                  v-model="contract.feedbackPics"
                   accept=".jpg, .jpeg, .png, .pdf"
                   />
                   <FileShow
-                  v-else
-                  :files="feed.feedbackPicList"
+                  v-permission="['supplier']"
+                  :files="contract.feedbackPics"
                   />
                 </div>
               </div>
@@ -94,7 +97,8 @@
             >导出
             </el-button>
             <el-button
-              v-if="contract.contractStatus === 0"
+              v-if="contract.status !== 0 &&
+              contract.contractStatus === 0"
               type="danger"
               style="float: right"
               @click="deletedContract"
@@ -196,7 +200,8 @@
               @click="recover(scope.row.id)"
             >恢复</el-tag>
             <el-tag
-              v-if="scope.row.draftStatus == 0"
+              v-if="contract.status != 0 &&
+              scope.row.draftStatus == 0"
               type="danger"
               style="margin-right: 15px; cursor: pointer"
               @click="deleted(scope.row.id)"
@@ -220,15 +225,21 @@
           @click="batFailed"
           >审核失败</el-button
         >
-        <el-button v-if="role === 2" type="primary" @click="addNewBill('')">
+        <el-button
+        v-if="contract.status !== 0 && role === 2"
+        type="primary"
+        @click="addNewBill('')">
           新增汇票</el-button>
+
         <el-button
+          v-if="contract.status !== 0"
           type="success"
           style="float: right"
           @click="recoverContractDraft"
         >恢复
         </el-button>
         <el-button
+          v-if="contract.status !== 0"
           type="danger"
           style="float: right"
           @click="deletedContractDraft"
@@ -363,10 +374,7 @@ export default {
         this.invoicePicList = this.contract.invoicePicList
         this.picList = this.contract.picList
         this.list = res.data.contractDraft.result
-        this.feed.feedbackPicList = this.contract.feedbackPics
         this.tradePicList = this.contract.tradePicList
-        this.feed.id = this.$route.query.id
-        this.feed.feedback = this.contract.feedback
         this.getPageData()
       })
     },
@@ -462,8 +470,9 @@ export default {
 
     /* 审核成功发送请求  */
     success() {
+      this.feed.feedback = this.contract.feedback
       /* 反馈图片赋值 */
-      this.feed.feedbackPicList = this.picList
+      this.feed.feedbackPicList = this.contract.feedbackPics
       /* 合同id赋值 */
       this.feed.id = this.$route.query.id
       /* 反馈内容赋值 */
@@ -491,8 +500,9 @@ export default {
 
     /* 审核失败发送请求  */
     failed() {
+      this.feed.feedback = this.contract.feedback
       /* 反馈图片赋值 */
-      this.feed.feedbackPicList = this.picList
+      this.feed.feedbackPicList = this.contract.feedbackPics
       /* 合同id赋值 */
       this.feed.id = this.$route.query.id
       this.feed.approveStatus = 2