8.20 19.12

src/components/AcceptorSelect/AcceptorSelect.vue

@@ -13,7 +13,7 @@
       v-for="item in options"
       :key="item.id"
       :label="item.acceptorName"
-      :value="item.id"
+      :value="item.acceptorId"
     />
   </el-select>
 </template>
@@ -66,7 +66,7 @@ export default {
       this.emitInput(value)
     },
     emitInput(value) {
-      const exist = this.options.find((o) => o.id === value)
+      const exist = this.options.find((o) => o.acceptorId === value)
       this.$emit('input', value)
       this.$emit('change', value, exist)
     }

src/components/BillForm/BillForm.vue

@@ -35,11 +35,11 @@
         </el-col>
         <!-- 出票人 -->
         <el-col :span="colSpan">
-			
+
           <el-form-item label="出票人"
           :prop="'contractDrafts.' + index + '.drawersId'"
           :rules="rules.drawersId">
-		  
+
             <DrawerSelect v-model="item.drawersId" />
            <i class="el-icon-circle-plus-outline" style="font-size:20px;cursor: pointer;"
             @click="addDrawer" />
@@ -115,22 +115,7 @@
             />
           </el-form-item>
         </el-col>
-        <!-- 服务费率 -->
-        <el-col :span="colSpan">
-          <el-form-item label="服务费率"
-          prop="serviceRate"
-          >
-            <el-input
-              v-model="item.serviceRate"
-              class="ipwidth"
-              placeholder="服务费率"
-              clearable
-              disabled
-            >
-             <template slot="append">%</template>
-           </el-input>
-          </el-form-item>
-        </el-col>
+
         <!-- 出票日期 -->
         <el-col :span="colSpan">
           <el-form-item label="出票日期"
@@ -201,7 +186,23 @@
             />
           </el-form-item>
         </el-col>
-        <!-- 利率 -->
+        <!-- 服务费率 -->
+        <el-col :span="colSpan">
+          <el-form-item label="服务费率"
+          prop="serviceRate"
+          >
+            <el-input
+              v-model="item.serviceRate"
+              class="ipwidth"
+              placeholder="服务费率"
+              clearable
+              disabled
+            >
+             <template slot="append">%</template>
+           </el-input>
+          </el-form-item>
+        </el-col>
+        <!-- 附件 -->
         <el-col :span="colSpan">
           <el-form-item label="附件"
            :rules="rules.picUrls"
@@ -213,6 +214,7 @@
             />
           </el-form-item>
         </el-col>
+
         <!-- 删除汇票 -->
         <el-col :span="24" style="text-align:right">
           <el-button
@@ -315,8 +317,10 @@ export default {
     },
     changeAcceptorName(value, exist, index) {
       if (exist) {
-        const { id, interest, serviceRate } = exist
-        this.contractDrafts[index].acceptorId = id
+        const { acceptorId, interest, serviceRate,acceptorName } = exist
+        console.log(exist,"exist")
+        this.contractDrafts[index].acceptorName=acceptorName
+        this.contractDrafts[index].acceptorId = acceptorId
         this.contractDrafts[index].interestRate = interest
         this.contractDrafts[index].serviceRate = serviceRate
         this.inputMoney(index)

src/views/contracts/detail.vue

@@ -109,14 +109,14 @@
 
             <el-button
               v-permission="['salesman', 'admin']"
-              type="warning"
+              type="primary"
               style="float: right"
               @click="failed"
               >审核失败
             </el-button>
             <el-button
               v-permission="['salesman', 'admin']"
-              type="success"
+              type="primary"
               style="float: right"
               @click="success"
               >审核成功

src/views/supplierAcceptor/index.vue

@@ -392,7 +392,7 @@ export default {
             type: "success",
             message: "提交成功!",
           });
-		this.getAllList();
+		      this.getAllList();
         }
       });
     },

src/views/table/index.vue

@@ -462,7 +462,7 @@ export default {
 			  }
 			});
 		}
-		
+
 	},
 
     recover(id) {
@@ -529,7 +529,7 @@ export default {
 			  }
 			});
 		}
-		
+
 	},
     deleteStatus(id) {
       this.$request({
@@ -614,10 +614,10 @@ export default {
     handleCommand(command) {
       this.Status = command;
       if (command === "正常") {
-        this.formData.Status = 0;
+        this.formData.Status = 5;
       }
       if (command === "删除") {
-        this.formData.Status = 1;
+        this.formData.Status = 4;
       }
       if (command === "全部") {
         this.formData.Status = "";
@@ -705,7 +705,7 @@ export default {
         this.$message.success("导出成功!");
       }
     },
- 
+
     /* 全部导出 */
     Exports() {
       const data = {