项目日志：7.29第二次合并

src/utils/request.js

@@ -77,12 +77,15 @@ service.interceptors.response.use(
   response => {
     const res = response.data
     // if the custom code is not 20000, it is judged as an error.
-    if (res.code !== 200) {
-      Message({
-        message: res.msg || 'Error',
-        type: 'error',
-        duration: 5 * 1000
-      })
+
+	console.log(res)
+    // if (res.code !== 200) {
+    //   Message({
+    //     message: res.msg || 'Error',
+    //     type: 'error',
+    //     duration: 5 * 1000
+    //   })
+
 
       // 50008: Illegal token; 50012: Other clients logged in; 50014: Token expired;
       // if (res.code === 50008 || res.code === 50012 || res.code === 50014) {
@@ -97,10 +100,21 @@ service.interceptors.response.use(
       //     })
       //   })
       // }
-      return Promise.reject(new Error(res.msg || 'Error'))
-    } else {
-      return res
-    }
+    //   return Promise.reject(new Error(res.msg || 'Error'))
+    // } else {
+    //   return res
+    // }
+		if(res.type==="application/x-zip-compressed"){
+			return res
+		}else if(res.code !== 200){
+			Message({
+			    message: res.msg || 'Error',
+			    type: 'error',
+			    duration: 5 * 1000
+			  })
+		}else{
+			return res
+		}
   },
   error => {
     console.log('err' + error) // for debug

src/views/contracts/addnewbill.vue

@@ -1,229 +1,544 @@
 <template>
   <div class="app-container">
-    <el-card class="box-card" style="padding: 20px 10px;">
-      <el-row>
-        <el-col :xs="24" :sm="12" :md="12" :lg="6" :xl="6" style="padding:0 15px;">
-          <el-form ref="form" :model="form" label-width="90px">
-            <el-form-item label="汇票名称" :rules="[{ message: '姓名不能为空不能为空'}]">
-              <el-input v-model="form.name" class="ipwidth" placeholder="请填写汇票名称" />
-            </el-form-item>
-            <el-form-item label="金额" :rules="[{ message: '电话号码不能为空'}]">
-              <el-input v-model="form.money" class="ipwidth" placeholder="请填写金额" />
-            </el-form-item>
-            <el-form-item label="预计贴现日" :rules="[{ message: '身份证不能为空'}]">
-              <el-date-picker v-model="value1" type="date" placeholder="选择日期" />
-            </el-form-item>
-            <el-form-item label="利率" :rules="[{ message: '身份证不能为空'}]">
-              <el-input v-model="form.count" class="ipwidth" placeholder="请填写利率" />
-            </el-form-item>
-          </el-form>
-        </el-col>
-        <el-col :xs="24" :sm="12" :md="12" :lg="6" :xl="6" style="padding:0 15px;">
-          <el-form ref="form" :model="form" label-width="110px">
-
-            <el-form-item label="汇票号码" :rules="[{ message: '姓名不能为空不能为空'}]">
-              <el-input v-model="form.nom" class="ipwidth" placeholder="请填写汇票号码" />
-            </el-form-item>
-            <el-form-item label="承兑日期" :rules="[{ message: '电话号码不能为空'}]">
-              <el-date-picker v-model="value2" type="date" placeholder="选择日期" />
-            </el-form-item>
-            <el-form-item label="最高贷款额度" :rules="[{ message: '身份证不能为空'}]">
-              <el-input v-model="form.max_mony" class="ipwidth" placeholder="请填写最高贷款额度" />
-            </el-form-item>
-            <el-form-item label="利息" :rules="[{ message: '身份证不能为空'}]">
-              <el-input v-model="form.rate" class="ipwidth" placeholder="请填写利息" />
-            </el-form-item>
-          </el-form>
-        </el-col>
-        <el-col :xs="24" :sm="12" :md="12" :lg="6" :xl="6" style="padding:0 15px;">
-          <el-form ref="form" :model="form" label-width="80px">
-
-            <el-form-item label="承兑人">
-              <el-select v-model="form.region" placeholder="请选择承兑人" class="ipwidth">
-                <el-option label="区域一" value="shanghai" />
-                <el-option label="区域二" value="beijing" />
-              </el-select>
-            </el-form-item>
-            <el-form-item label="出票日期">
-              <el-date-picker v-model="value3" type="date" placeholder="选择日期" class="ipwidth" />
-            </el-form-item>
-            <el-form-item label="服务费率">
-              <el-input v-model="form.serpointo" class="ipwidth" placeholder="请填写服务费率" />
-            </el-form-item>
-
-          </el-form>
-
-        </el-col>
-        <el-col :xs="24" :sm="12" :md="12" :lg="6" :xl="6" style="padding:0 15px;">
-          <el-form ref="form" :model="form" label-width="85px">
-            <el-form-item label="出票人">
-              <el-select v-model="form.region" placeholder="请选择出票人" class="ipwidth">
-                <el-option label="区域一" value="shanghai" />
-                <el-option label="区域二" value="beijing" />
-              </el-select>
-            </el-form-item>
-            <el-form-item label="汇票到期日">
-              <el-date-picker v-model="value4" type="date" placeholder="选择日期" class="ipwidth" />
-            </el-form-item>
-            <el-form-item label="服务费">
-              <el-input v-model="form.serpointt" class="ipwidth" placeholder="请填写服务费" />
-            </el-form-item>
-          </el-form>
-
-        </el-col>
-
-      </el-row>
-      <el-row>
-        <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" style="margin:0 30px;;">
-          <div class="titlesa">
-            <p>附件</p>
-            <p style="color: #D05C39;">*支持上传pdf、jpg/jpeg、png格式</p>
-          </div>
-          <div>
-            <el-upload action="#" list-type="picture-card" :auto-upload="false">
-              <i slot="default" class="el-icon-plus" />
-              <div slot="file" slot-scope="{file}">
-                <img class="el-upload-list__item-thumbnail" :src="file.url" alt="">
-                <span class="el-upload-list__item-actions">
-                  <span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">
-                    <i class="el-icon-zoom-in" />
-                  </span>
-                  <span v-if="!disabled" class="el-upload-list__item-delete" @click="handleDownload(file)">
-                    <i class="el-icon-download" />
-                  </span>
-                  <span v-if="!disabled" class="el-upload-list__item-delete" @click="handleRemove(file)">
-                    <i class="el-icon-delete" />
-                  </span>
-                </span>
-              </div>
-            </el-upload>
-            <el-dialog :visible.sync="dialogVisible">
-              <img width="100%" :src="dialogImageUrl" alt="">
-            </el-dialog>
-          </div>
-        </el-col>
-      </el-row>
+    <!-- 汇票模块 -->
+    <div
+      v-for="(item, index) in form.contractDrafts"
+      :key="item.id"
+      class="form"
+      style="margin: 20px;border: 1px solid #c0c0c0;padding: 10px;border-radius: 10px;"
+    >
+
+      <!-- 汇票名称 -->
+      <el-form ref="form" :model="item" label-width="90px">
+
+        <el-form-item label="汇票名称">
+          <el-input
+            v-model="item.name"
+            class="ipwidth"
+            placeholder="请填写汇票名称"
+            style="width: 220px"
+          />
+        </el-form-item>
+        <!-- 预计贴现日 -->
+        <el-form-item label="预计贴现日">
+          <el-date-picker
+            v-model="item.expectDiscountDate"
+            type="date"
+            placeholder="选择日期"
+            value-format="yyyy-MM-dd"
+            @change="inputMoney(index, 4)"
+            @input="inputMoney(index)"
+          />
+        </el-form-item>
+        <!-- 出票日期 -->
+        <el-form-item label="出票日期">
+          <el-date-picker
+            v-model="item.acceptDate"
+            type="date"
+            placeholder="选择日期"
+            class="ipwidth"
+            @change="change(index, 2)"
+          />
+        </el-form-item>
+        <!-- 承兑日期 -->
+        <el-form-item label="承兑日期">
+          <el-date-picker
+            v-model="item.issueDate"
+            type="date"
+            placeholder="选择日期"
+            default-value
+            value-format="yyyy-MM-dd"
+            @change="inputMoney(index, 1)"
+            @input="inputMoney(index)"
+          />
+        </el-form-item>
+        <!-- 到期日期 -->
+        <el-form-item label="到期日期">
+          <el-date-picker
+            v-model="item.expireDate"
+            type="date"
+            placeholder="选择日期"
+            @change="change(index, 3)"
+          />
+        </el-form-item>
+      </el-form>
+      <!-- 汇票号码 -->
+      <el-form ref="form" :model="form" label-width="100px">
+        <el-form-item label="汇票号码">
+          <el-input
+            v-model="item.draftNo"
+            class="ipwidth"
+            placeholder="请填写汇票号码"
+            style="width: 220px"
+          />
+        </el-form-item>
+
+        <!-- 金额 -->
+        <el-form-item label="金额">
+          <el-input
+            v-model="item.money"
+            class="ipwidth"
+            placeholder="请填写金额"
+            style="width: 220px"
+            @blur="getMoney(index)"
+            @input="inputMoney(index)"
+          />
+        </el-form-item>
+        <!-- 服务费 -->
+        <el-form-item label="服务费">
+          <el-input
+            v-model="item.serviceMoney"
+            class="ipwidth"
+            placeholder="计算得出服务费"
+            style="width: 220px"
+          />
+        </el-form-item>
+        <!-- 最高贷款额度 -->
+        <el-form-item label="最高贷款额度">
+          <el-input
+            v-model="item.loanLimit"
+            class="ipwidth"
+            placeholder="计算得出最高贷款额度"
+            style="width: 220px"
+          />
+        </el-form-item>
+        <el-form-item label="利息">
+          <el-input
+            v-model="item.interest"
+            class="ipwidth"
+            placeholder="计算得出利息"
+            style="width: 220px"
+          />
+        </el-form-item>
+      </el-form>
+      <!-- 出票人 -->
+      <el-form ref="form" :model="form" label-width="90px">
+        <el-form-item label="出票人">
+          <el-select v-model="form.drawersName" placeholder="请选择出票人">
+            <el-option
+              label="新增出票人"
+              value=""
+              style="color: darkorange"
+              @click.native="addDrawer"
+            />
+            <el-option
+              v-for="item in drawersName"
+              :key="item.id"
+              :label="item"
+              :value="item"
+			   @click.native="getdrawersId(index,item)"
+            />
+          </el-select>
+        </el-form-item>
+        <!-- 承兑人 -->
+        <el-form-item label="承兑人">
+          <el-select v-model="form.acceptorName" filterable placeholder="请选择承兑人">
+            <el-option
+              v-for="val in acceptorName"
+              :key="val"
+              :label="val"
+
+              :value="val"
+              @click.native="getRate(index)"
+            />
+
+          </el-select>
+        </el-form-item>
+        <!-- 服务费率 -->
+
+        <el-form-item label="服务费率">
+          <el-input
+            v-model="item.serviceRate"
+            class="ipwidth"
+            placeholder="服务费率"
+            style="width: 220px"
+            @input="inputMoney(index)"
+          />
+        </el-form-item>
+        <!-- 利率 -->
+        <el-form-item label="利率">
+          <el-input
+            v-model="item.interestRate"
+            class="ipwidth"
+            placeholder="利率"
+            style="width: 220px"
+            @input="inputMoney(index)"
+          />
+        </el-form-item>
+      </el-form>
+      <!-- 汇票附件上传 -->
+      <div>
+        <el-row>
+          <el-col style="margin: 0 auto">
+            <div class="titlesa">
+              <span>附件</span>
+              <span
+                style="color: #d05c39"
+              >*支持上传pdf、jpg/jpeg、png格式</span>
+            </div>
+            <div>
+              <el-upload
+                action="https://ht.9026.com/api/File"
+                list-type="picture-card"
+                :on-success="handlepicUrls"
+              >
+                <i class="el-icon-plus" />
+              </el-upload>
+
+              <el-dialog :visible.sync="dialogVisible">
+                <img
+                  width="100%"
+                  :src="form.contractDrafts[0].picUrls"
+                  alt=""
+                >
+              </el-dialog>
+            </div>
+          </el-col>
+        </el-row>
+
+        <!-- 删除汇票 -->
+        <el-button
+          type="primary"
+          style="width: 100px; height: 50px; margin-top: 50px"
+          @click="deletedraft(index)"
+        >删除汇票</el-button>
+      </div>
+    </div>
+    <!-- 新增汇票 -->
+    <div class="commit">
       <div class="addnew">
-        <el-button type="info">新增汇票</el-button>
+        <el-button type="primary" @click="adddraft">新增汇票</el-button>
       </div>
       <div class="addall">
-        <el-button type="warning" style="width: 180px;height: 45px;font-size: 16px;">确认上传</el-button>
+        <el-button
+          type="warning"
+          style="width: 180px; height: 45px; font-size: 16px"
+          @click="onSubmit"
+        >确认上传
+        </el-button>
       </div>
-    </el-card>
-
-    <div />
+    </div>
   </div>
 </template>
 
 <script>
+import { maxLoanAmount, serviceCharge, interest } from '@/utils/calc'
 export default {
   data() {
     return {
-      url: 'https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg',
-      srcList: [
-        'https://fuss10.elemecdn.com/8/27/f01c15bb73e1ef3793e64e6b7bbccjpeg.jpeg',
-        'https://fuss10.elemecdn.com/1/8e/aeffeb4de74e2fde4bd74fc7b4486jpeg.jpeg'
-      ],
-      resource: '',
-      radio: '1',
-      activeNames: '',
+      dialogVisible: false,
+      disabled: false,
+      drawersList: [],
+      acceptorList: [],
+      contractList: [],
+      filesArray: [], // 汇票图片上传数组
+      file: '',
       form: {
-        name: '',
-        money: '',
-        count: '',
-        nom: '',
-        max_mony: '',
-        rate: '',
-        serpointo: '',
-        serpointt: ''
-
+        // 承兑人列表
+        acceptorName: [],
+        // 出票人列表
+        drawersName: [],
+        /* 汇票的数据 */
+        contractDrafts: [
+          {
+            name: '',
+            draftNo: '',
+            acceptorId: '',
+            drawersId: '',
+            money: '',
+            acceptDate: '',
+            loanLimit: '',
+            serviceRate: '',
+            serviceMoney: '',
+            interestRate: '',
+            interest: '',
+            picUrls: [],
+            expectDiscountDate: '',
+            issueDate: '',
+            expireDate:'',
+            acceptDateTime: '',
+            expectDiscountDateTime: '',
+			contractId:59,
+			limitTime:''
+          }
+        ]
       },
       pickerOptions: {
         disabledDate(time) {
           return time.getTime() > Date.now()
         },
-        shortcuts: [{
-          text: '今天',
-          onClick(picker) {
-            picker.$emit('pick', new Date())
-          }
-        }, {
-          text: '昨天',
-          onClick(picker) {
-            const date = new Date()
-            date.setTime(date.getTime() - 3600 * 1000 * 24)
-            picker.$emit('pick', date)
-          }
-        }, {
-          text: '一周前',
-          onClick(picker) {
-            const date = new Date()
-            date.setTime(date.getTime() - 3600 * 1000 * 24 * 7)
-            picker.$emit('pick', date)
+        shortcuts: [
+          {
+            text: '今天',
+            onClick(picker) {
+              picker.$emit('pick', new Date())
+            }
+          },
+          {
+            text: '昨天',
+            onClick(picker) {
+              const date = new Date()
+              date.setTime(date.getTime() - 3600 * 1000 * 24)
+              picker.$emit('pick', date)
+            }
+          },
+          {
+            text: '一周前',
+            onClick(picker) {
+              const date = new Date()
+              date.setTime(date.getTime() - 3600 * 1000 * 24 * 7)
+              picker.$emit('pick', date)
+            }
           }
-        }]
-      },
-      value1: '',
-      value2: '',
-      value3: '',
-      value4: '',
-      dialogImageUrl: '',
-      dialogVisible: false,
-      disabled: false
+        ]
+      }
     }
   },
+  mounted() {
+	// 获取合同id
+	const id = this.$route.query.id
+	
+    this.$request({
+      url: '/api/Acceptor/search',
+      method: 'post',
+      data: {
+        pageIndex: 1,
+        pageSize: 100
+      }
+    }).then((res) => {
+      this.acceptorList = res.data.result
+      this.acceptorName = Array.from(this.acceptorList, ({ name }) => name)
+    })
+    this.$request({
+      url: '/api/Drawer/search',
+      method: 'post',
+      data: {
+        pageIndex: 1,
+        pageSize: 100
+      }
+    }).then((res) => {
+      this.drawersList = res.data.result
+      this.drawersName = Array.from(this.drawersList, ({ name }) => name)
+      // 去除重复的出票人
+      for (var i = 0; i < this.drawersName.length; i++) {
+        // 首次遍历数组
+        for (var j = i + 1; j < this.drawersName.length; j++) {
+          // 再次遍历数组
+          if (this.drawersName[i] === this.drawersName[j]) {
+            // 判断连个值是否相等
+            this.drawersName.splice(j, 1) // 相等删除后者
+            j--
+          }
+        }
+      }
+    })
+    /* 调用获取当前的时间 */
+    this.loadTime()
+  },
   methods: {
-    handleRemove(file) {
-      console.log(file)
+    inputMoney(index) {
+      const { money, serviceRate, interestRate, expectDiscountDate, issueDate } = this.form.contractDrafts[index]
+      this.form.contractDrafts[index].loanLimit = maxLoanAmount(money, serviceRate, interestRate, expectDiscountDate, issueDate)
     },
-    handlePictureCardPreview(file) {
-      this.dialogImageUrl = file.url
-      this.dialogVisible = true
+    /* 确实上传按钮 */
+    onSubmit() {
+      this.$request({
+        url: 'api/Contract/addContractDraft',
+        method: 'post',
+        data: this.form.contractDrafts
+      }).then((res) => {
+        console.log(res)
+        this.$message({
+          message: '上传成功',
+          type: 'success'
+        })
+		this.$router.go(-1)
+      })
     },
-    handleDownload(file) {
-      console.log(file)
+
+    /* 默认时间 */
+    loadTime() {
+      const myDate = new Date()
+      const wk = parseInt(Date.now() / 100000).toFixed(0) * 100000
+      const yy = String(myDate.getFullYear())
+      // let mm = myDate.getMonth() + 1
+      const mm = String(
+        myDate.getMonth() + 1 < 10
+          ? '0' + (myDate.getMonth() + 1)
+          : myDate.getMonth() + 1
+      )
+      const dd = String(
+        myDate.getDate() < 10 ? '0' + myDate.getDate() : myDate.getDate()
+      )
+      const nowDate = yy + '-' + mm + '-' + dd
+      this.form.contractDrafts.forEach((item) => {
+        item.acceptDate = nowDate
+        item.issueDate = nowDate
+        item.expireDate = nowDate
+        item.expectDiscountDate = nowDate
+        item.expectDiscountDateTime = wk
+        item.acceptDateTime = wk
+        const nTime = item.acceptDateTime - item.expectDiscountDateTime
+        item.limitTime = Math.floor(nTime / 86400000)
+      })
     },
-    handleChange() {
 
+
+    /* 上传图片到浏览器成功回调 */
+    handlepicUrls(res) {
+      // 解构
+      const { file } = res.data
+      this.filesArray.push(file)
+      this.form.contractDrafts[0].picUrls = this.filesArray
     },
-    onSubmit() {
-      this.$message('submit!')
+
+    /* 获取服务率和利率,承兑人id */
+    getRate(index) {
+      const list = this.acceptorList.filter(
+        (item) => item.name === this.form.acceptorName
+      )
+		console.log(list)
+	  this.form.contractDrafts[index].acceptorId=list[index].id
+      this.form.contractDrafts[index].interestRate = list[index].interest
+      this.form.contractDrafts[index].serviceRate = list[index].serviceRate
     },
-    onCancel() {
-      this.$message({
-        message: 'cancel!',
-        type: 'warning'
+	// 获取出票人id
+	getdrawersId(index,name){
+		const drawers=this.drawersList.filter((item)=>item.name===name)
+		console.log(drawers)
+		this.form.contractDrafts[index].drawersId=drawers[index].id
+		console.log(drawers[index].id)
+	},
+    addDrawer() {
+      this.$router.push({
+        path: '/form/addTicketdrawer'
       })
+    },
+    // 新增汇票
+    adddraft() {
+      this.form.contractDrafts.push({
+        name: '',
+        draftNo: '',
+        acceptorId: '',
+        drawersId: '',
+        money: '',
+        acceptDate: '',
+        loanLimit: '',
+        serviceRate: '',
+        serviceMoney: '',
+        interestRate: '',
+        interest: '',
+        picUrls: [],
+        expectDiscountDate: '',
+        issueDate: '',
+        expireDate: '',
+        limitTime: ''
+      })
+	  
+    },
+    // 删除汇票
+    deletedraft(index) {
+      const contractDraftsLength = this.form.contractDrafts.length
+      if (contractDraftsLength > 1) {
+        this.form.contractDrafts.splice(index, 1)
+      } else {
+        this.$message.error('至少一个')
+      }
+    },
+
+    /* 计算时间段 */
+    change(e, number) {},
+
+    /* 获取金额 */
+    getMoney(index) {
+      this.getloanLimt(index)
+      this.getSerMoney(index)
+      this.getInterMoney(index)
+    },
+    /* 计算最高贷款额度 */
+    getloanLimt(i) {
+      if (
+        this.form.contractDrafts[i].money &&
+        this.form.contractDrafts[i].serviceRate &&
+        this.form.contractDrafts[i].interestRate
+      ) {
+        this.form.contractDrafts[i].loanLimit = (
+          ((this.form.contractDrafts[i].money /
+            (this.form.contractDrafts[i].serviceRate +
+              this.form.contractDrafts[i].interestRate)) *
+            this.form.contractDrafts[i].limitTime) /
+            360 +
+          1
+        ).toFixed(2)
+      }
+    },
+    /* 计算服务费 */
+    getSerMoney(i) {
+      if (
+        this.form.contractDrafts[i].money &&
+        this.form.contractDrafts[i].serviceRate &&
+        this.form.contractDrafts[i].interestRate
+      ) {
+        this.form.contractDrafts[i].serviceMoney = (
+          ((((this.form.contractDrafts[i].money /
+            (this.form.contractDrafts[i].serviceRate +
+              this.form.contractDrafts[i].interestRate)) *
+            this.form.contractDrafts[i].limitTime) /
+            360 +
+            1) *
+            this.form.contractDrafts[i].serviceRate *
+            this.form.contractDrafts[i].limitTime) /
+          360
+        ).toFixed(2)
+      }
+    },
+    /* 利息*/
+    getInterMoney(i) {
+      if (
+        this.form.contractDrafts[i].money &&
+        this.form.contractDrafts[i].serviceRate &&
+        this.form.contractDrafts[i].interestRate
+      ) {
+        this.form.contractDrafts[i].interest = (
+          ((((this.form.contractDrafts[i].money /
+            (this.form.contractDrafts[i].serviceRate +
+              this.form.contractDrafts[i].interestRate)) *
+            this.form.contractDrafts[i].limitTime) /
+            360 +
+            1) *
+            this.form.contractDrafts[i].interestRate *
+            this.form.contractDrafts[i].limitTime) /
+          360
+        ).toFixed(2)
+      }
     }
   }
 }
 </script>
 
 <style lang="scss">
-  .line {
-    text-align: center;
-  }
+.contract {
+  display: flex;
+  justify-content: space-between;
+  margin-bottom: 20px;
+}
 
-  .ipwidth {
-    width: 100%;
-  }
+.form {
+  display: flex;
+  justify-content: space-around;
+}
 
-  .el-radio__label {
-    margin-left: 80px;
-  }
+.addnew {
+  display: flex;
+  justify-content: flex-end;
+}
 
-  .el-collapse-item__header {
-    font-weight: 600;
-    color: #606266;
-  }
-  .addnew{
-    display: flex;
-    justify-content: flex-end;
-  }
-  .addall{
-   display: flex;
-   justify-content: center;
-   align-items: center;
-   margin-top: 40px;
-  }
+.addall {
+  display: flex;
+  justify-content: center;
+}
+
+.commit {
+  margin: 20px 0;
+}
 </style>

src/views/contracts/detail.vue

@@ -16,7 +16,19 @@
             <span class="titlename">合同附件</span>
             <div style="display: flex">
               <div class="imgbox">
-                <el-image
+                <template v-for="(item, index) in picList">
+                  <el-image
+                    v-if="isPDF(item)"
+                    :key="index"
+                    style="width: 100px; height: 100px"
+                    :src="item"
+                    :preview-src-list="picList"
+                  />
+                  <a v-else :key="index" :href="item" target="_blank">
+                    <img style="width: 100px; height: 100px" :src="pdf">
+                  </a>
+                </template>
+                <!-- <el-image
                   v-for="(item) in picList"
                   :key="item.id"
                   style="width: 100px; height: 100px"
@@ -27,7 +39,7 @@
                   :key="item.id"
                   style="width: 100px; height: 100px"
                   :src="item"
-                />
+                /> -->
               </div>
             </div>
           </div>
@@ -35,13 +47,24 @@
             <span class="titlename">发票附件</span>
             <div style="display: flex">
               <div class="imgbox">
-                <el-image
+                <template v-for="(item, index) in invoicePicList">
+                  <el-image
+                    v-if="isPDF(item)"
+                    :key="index"
+                    style="width: 100px; height: 100px"
+                    :src="item"
+                    :preview-src-list="invoicePicList"
+                  />
+                  <a v-else :key="index" :href="item" target="_blank">
+                    <img style="width: 100px; height: 100px" :src="pdf">
+                  </a>
+                </template>
+                <!-- <el-image
                   v-for="(item) in invoicePicList"
                   :key="item.id"
                   style="width: 100px; height: 100px"
                   :src="item"
-                />
-
+                /> -->
               </div>
             </div>
           </div>
@@ -53,13 +76,24 @@
             <span class="titlename">贸易合同</span>
             <div style="display: flex">
               <div class="imgbox">
-                <el-image
+                <template v-for="(item, index) in tradePicList">
+                  <el-image
+                    v-if="isPDF(item)"
+                    :key="index"
+                    style="width: 100px; height: 100px"
+                    :src="item"
+                    :preview-src-list="tradePicList"
+                  />
+                  <a v-else :key="index" :href="item" target="_blank">
+                    <img style="width: 100px; height: 100px" :src="pdf">
+                  </a>
+                </template>
+                <!-- <el-image
                   v-for="(item) in tradePicList"
                   :key="item.id"
                   style="width: 100px; height: 100px"
                   :src="item"
-                />
-
+                /> -->
               </div>
             </div>
           </div>
@@ -70,7 +104,9 @@
                 contract.contractStatusText
               }}</span>
             </div>
-            <span class="aoiisp">审核结果：
+            <span
+              class="aoiisp"
+            >审核结果：
               <p style="color: #d8ab5a">{{ contract.statusText }}</p></span>
           </div>
 
@@ -93,7 +129,7 @@
                     list-type="picture-card"
                     :on-success="handleFeedbackPicList"
                   >
-                  <!-- <img v-if="feed.feedbackPicList" :src="feed.feedbackPicList" class="avatar"> -->
+                    <!-- <img v-if="feed.feedbackPicList" :src="feed.feedbackPicList" class="avatar"> -->
                     <i class="el-icon-plus" />
                   </el-upload>
                   <el-dialog :visible.sync="dialogVisible">
@@ -297,11 +333,9 @@ export default {
   },
 
   mounted() {
-
-    this.role = this.$store.state.user.userInfo.type;
-    this.checked = this.$store.state.user.checked;
-    this.getData();
-
+    this.role = this.$store.state.user.userInfo.type
+    this.checked = this.$store.state.user.checked
+    this.getData()
   },
   methods: {
     getData() {
@@ -310,21 +344,30 @@ export default {
         url: '/api/Contract/' + id,
         method: 'get'
       }).then((res) => {
-        this.contract = res.data;
-        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();
-      });
-
+        this.contract = res.data
+        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()
+      })
+    },
+    isPDF(url) {
+      const fileType = ['pdf']
+      const index = url.lastIndexOf('.')
+      const type = url.substr(index + 1)
+      return fileType.indexOf(type) === -1
     },
     addNewBill() {
+      const id = this.$route.query.id
       this.$router.push({
-        name: 'addnewbill'
+        name: 'addnewbill',
+        query: {
+          id: id
+        }
       })
     },
     tapDetail(id) {
@@ -363,7 +406,6 @@ export default {
       this.temporaryList = this.srcList
     },
 
-
     /* 导出 */
     ExportsContractDraft() {
       if (this.multipleSelection === '') {
@@ -404,12 +446,11 @@ export default {
 
     /* 反馈图片图片上传成功 */
 
-    handleFeedbackPicList(res){
-      //解构
-      const { file } = res.data;
+    handleFeedbackPicList(res) {
+      // 解构
+      const { file } = res.data
       this.feedbackPicListArray.push(file)
-      this.feed.feedbackPicList = this.feedbackPicListArray;
-
+      this.feed.feedbackPicList = this.feedbackPicListArray
     },
 
     /* 审核成功发送请求  */

src/views/contracts/new_file.vue

@@ -49,7 +49,8 @@
         <span style="color: #d05c39">*支持上传pdf、jpg/jpeg、png格式</span>
       </div>
       <div>
-        <el-upload
+        <Upload v-model="form.invoicePics" />
+        <!-- <el-upload
           action="https://ht.9026.com/api/File"
           list-type="picture-card"
           :on-success="handleinvoicePics"
@@ -58,7 +59,7 @@
         </el-upload>
         <el-dialog :visible.sync="dialogVisible">
           <img width="100%" :src="form.invoicePics">
-        </el-dialog>
+        </el-dialog> -->
       </div>
       <!-- 贸易附件图片 -->
       <div class="titlesa">
@@ -66,7 +67,8 @@
         <span style="color: #d05c39">*支持上传pdf、jpg/jpeg、png格式</span>
       </div>
       <div>
-        <el-upload
+        <Upload v-model="form.tradePics" />
+        <!-- <el-upload
           action="https://ht.9026.com/api/File"
           list-type="picture-card"
           :on-success="handletradePics"
@@ -75,7 +77,7 @@
         </el-upload>
         <el-dialog :visible.sync="dialogVisible">
           <img width="100%" :src="form.tradePics">
-        </el-dialog>
+        </el-dialog> -->
       </div>
     </el-card>
 
@@ -84,12 +86,15 @@
       v-for="(item, index) in form.contractDrafts"
       :key="item.id"
       class="form"
-      style="margin: 20px;border: 1px solid #c0c0c0;padding: 10px;border-radius: 10px;"
+      style="
+        margin: 20px;
+        border: 1px solid #c0c0c0;
+        padding: 10px;
+        border-radius: 10px;
+      "
     >
-
       <!-- 汇票名称 -->
       <el-form ref="form" :model="item" label-width="90px">
-
         <el-form-item label="汇票名称">
           <el-input
             v-model="item.name"
@@ -106,7 +111,6 @@
             placeholder="选择日期"
             value-format="yyyy-MM-dd"
             @change="inputMoney(index, 4)"
-            @input="inputMoney(index)"
           />
         </el-form-item>
         <!-- 出票日期 -->
@@ -116,7 +120,6 @@
             type="date"
             placeholder="选择日期"
             class="ipwidth"
-            @change="change(index, 2)"
           />
         </el-form-item>
         <!-- 承兑日期 -->
@@ -128,7 +131,6 @@
             default-value
             value-format="yyyy-MM-dd"
             @change="inputMoney(index, 1)"
-            @input="inputMoney(index)"
           />
         </el-form-item>
         <!-- 到期日期 -->
@@ -137,7 +139,6 @@
             v-model="item.expireDate"
             type="date"
             placeholder="选择日期"
-            @change="change(index, 3)"
           />
         </el-form-item>
       </el-form>
@@ -170,6 +171,7 @@
             class="ipwidth"
             placeholder="计算得出服务费"
             style="width: 220px"
+            @input="inputMoney(index)"
           />
         </el-form-item>
         <!-- 最高贷款额度 -->
@@ -179,32 +181,28 @@
             class="ipwidth"
             placeholder="计算得出最高贷款额度"
             style="width: 220px"
+            @input="inputMoney(index)"
           />
         </el-form-item>
 
-        <!-- <el-form-item label="金额">
-        <el-input
-          v-model="item.money"
-          class="ipwidth"
-          placeholder="请填写金额"
-          style="width: 220px"
-          @change="computed"
-        />
-      </el-form-item> -->
-
         <el-form-item label="利息">
           <el-input
             v-model="item.interest"
             class="ipwidth"
             placeholder="计算得出利息"
             style="width: 220px"
+            @input="inputMoney(index)"
           />
         </el-form-item>
       </el-form>
       <!-- 出票人 -->
       <el-form ref="form" :model="form" label-width="90px">
         <el-form-item label="出票人">
-          <el-select v-model="form.drawersName" placeholder="请选择出票人">
+          <el-select
+            v-model="form.drawersName"
+            filterable
+            placeholder="请选择出票人"
+          >
             <el-option
               label="新增出票人"
               value=""
@@ -216,29 +214,27 @@
               :key="item.id"
               :label="item"
               :value="item"
+              @click.native="getdrawersId(index, item)"
             />
           </el-select>
         </el-form-item>
         <!-- 承兑人 -->
         <el-form-item label="承兑人">
-          <el-select v-model="form.acceptorName" filterable placeholder="请选择承兑人">
+          <el-select
+            v-model="form.acceptorName"
+            filterable
+            placeholder="请选择承兑人"
+          >
             <el-option
               v-for="val in acceptorName"
               :key="val"
               :label="val"
-
               :value="val"
               @click.native="getRate(index)"
             />
-
           </el-select>
         </el-form-item>
 
-        <!--              @click.native="getRate(index)"
-              :key="val.id"
-            />
-          </el-select>
-        </el-form-item> -->
         <!-- 服务费率 -->
 
         <el-form-item label="服务费率">
@@ -442,16 +438,62 @@ export default {
         }
       }
     })
-
     /* 调用获取当前的时间 */
     this.loadTime()
   },
   methods: {
     inputMoney(index) {
-      const { money, serviceRate, interestRate, expectDiscountDate, issueDate } = this.form.contractDrafts[index]
-      this.form.contractDrafts[index].loanLimit = maxLoanAmount(money, serviceRate, interestRate, expectDiscountDate, issueDate)
+      this.getloanLimt(index)
+      this.getSerMoney(index)
+      this.getInterMoney(index)
+    },
+    /* 计算最高贷款额度 */
+    getloanLimt(index) {
+      const {
+        money,
+        serviceRate,
+        interestRate,
+        expectDiscountDate,
+        issueDate
+      } = this.form.contractDrafts[index]
+      this.form.contractDrafts[index].loanLimit = maxLoanAmount(
+        money,
+        serviceRate,
+        interestRate,
+        expectDiscountDate,
+        issueDate
+      )
+    },
+    // /* 计算服务费 */
+    getSerMoney(index) {
+      const {
+        loanLimit,
+        serviceRate,
+        expectDiscountDate,
+        issueDate
+      } = this.form.contractDrafts[index]
+      this.form.contractDrafts[index].serviceMoney = serviceCharge(
+        loanLimit,
+        serviceRate,
+        expectDiscountDate,
+        issueDate
+      )
+    },
+    /* 利息*/
+    getInterMoney(index) {
+      const {
+        loanLimit,
+        interestRate,
+        expectDiscountDate,
+        issueDate
+      } = this.form.contractDrafts[index]
+      this.form.contractDrafts[index].interest = interest(
+        loanLimit,
+        interestRate,
+        expectDiscountDate,
+        issueDate
+      )
     },
-    /* 确实上传按钮 */
     onSubmit() {
       this.$request({
         url: '/api/Contract',
@@ -531,14 +573,23 @@ export default {
       }
     },
 
-    /* 获取服务率和利率 */
+    /* 获取服务率和利率,承兑人id */
     getRate(index) {
       const list = this.acceptorList.filter(
         (item) => item.name === this.form.acceptorName
       )
+      console.log(list)
+      this.form.contractDrafts[index].acceptorId = list[index].id
       this.form.contractDrafts[index].interestRate = list[index].interest
       this.form.contractDrafts[index].serviceRate = list[index].serviceRate
     },
+    // 获取出票人id
+    getdrawersId(index, name) {
+      const drawers = this.drawersList.filter((item) => item.name === name)
+      console.log(drawers)
+      this.form.contractDrafts[index].drawersId = drawers[index].id
+      console.log(drawers[index].id)
+    },
     addDrawer() {
       this.$router.push({
         path: '/form/addTicketdrawer'
@@ -576,71 +627,71 @@ export default {
     },
 
     /* 计算时间段 */
-    change(e, number) {},
+    change(e, number) {}
 
-    /* 获取金额 */
-    getMoney(index) {
-      this.getloanLimt(index)
-      this.getSerMoney(index)
-      this.getInterMoney(index)
-    },
-    /* 计算最高贷款额度 */
-    getloanLimt(i) {
-      if (
-        this.form.contractDrafts[i].money &&
-        this.form.contractDrafts[i].serviceRate &&
-        this.form.contractDrafts[i].interestRate
-      ) {
-        this.form.contractDrafts[i].loanLimit = (
-          ((this.form.contractDrafts[i].money /
-            (this.form.contractDrafts[i].serviceRate +
-              this.form.contractDrafts[i].interestRate)) *
-            this.form.contractDrafts[i].limitTime) /
-            360 +
-          1
-        ).toFixed(2)
-      }
-    },
-    /* 计算服务费 */
-    getSerMoney(i) {
-      if (
-        this.form.contractDrafts[i].money &&
-        this.form.contractDrafts[i].serviceRate &&
-        this.form.contractDrafts[i].interestRate
-      ) {
-        this.form.contractDrafts[i].serviceMoney = (
-          ((((this.form.contractDrafts[i].money /
-            (this.form.contractDrafts[i].serviceRate +
-              this.form.contractDrafts[i].interestRate)) *
-            this.form.contractDrafts[i].limitTime) /
-            360 +
-            1) *
-            this.form.contractDrafts[i].serviceRate *
-            this.form.contractDrafts[i].limitTime) /
-          360
-        ).toFixed(2)
-      }
-    },
-    /* 利息*/
-    getInterMoney(i) {
-      if (
-        this.form.contractDrafts[i].money &&
-        this.form.contractDrafts[i].serviceRate &&
-        this.form.contractDrafts[i].interestRate
-      ) {
-        this.form.contractDrafts[i].interest = (
-          ((((this.form.contractDrafts[i].money /
-            (this.form.contractDrafts[i].serviceRate +
-              this.form.contractDrafts[i].interestRate)) *
-            this.form.contractDrafts[i].limitTime) /
-            360 +
-            1) *
-            this.form.contractDrafts[i].interestRate *
-            this.form.contractDrafts[i].limitTime) /
-          360
-        ).toFixed(2)
-      }
-    }
+    // /* 获取金额 */
+    // getMoney(index) {
+    //   this.getloanLimt(index)
+    //   this.getSerMoney(index)
+    //   this.getInterMoney(index)
+    // }
+    // /* 计算最高贷款额度 */
+    // getloanLimt(i) {
+    //   if (
+    //     this.form.contractDrafts[i].money &&
+    //     this.form.contractDrafts[i].serviceRate &&
+    //     this.form.contractDrafts[i].interestRate
+    //   ) {
+    //     this.form.contractDrafts[i].loanLimit = (
+    //       ((this.form.contractDrafts[i].money /
+    //         (this.form.contractDrafts[i].serviceRate +
+    //           this.form.contractDrafts[i].interestRate)) *
+    //         this.form.contractDrafts[i].limitTime) /
+    //         360 +
+    //       1
+    //     ).toFixed(2)
+    //   }
+    // },
+    // /* 计算服务费 */
+    // getSerMoney(i) {
+    //   if (
+    //     this.form.contractDrafts[i].money &&
+    //     this.form.contractDrafts[i].serviceRate &&
+    //     this.form.contractDrafts[i].interestRate
+    //   ) {
+    //     this.form.contractDrafts[i].serviceMoney = (
+    //       ((((this.form.contractDrafts[i].money /
+    //         (this.form.contractDrafts[i].serviceRate +
+    //           this.form.contractDrafts[i].interestRate)) *
+    //         this.form.contractDrafts[i].limitTime) /
+    //         360 +
+    //         1) *
+    //         this.form.contractDrafts[i].serviceRate *
+    //         this.form.contractDrafts[i].limitTime) /
+    //       360
+    //     ).toFixed(2)
+    //   }
+    // },
+    // /* 利息*/
+    // getInterMoney(i) {
+    //   if (
+    //     this.form.contractDrafts[i].money &&
+    //     this.form.contractDrafts[i].serviceRate &&
+    //     this.form.contractDrafts[i].interestRate
+    //   ) {
+    //     this.form.contractDrafts[i].interest = (
+    //       ((((this.form.contractDrafts[i].money /
+    //         (this.form.contractDrafts[i].serviceRate +
+    //           this.form.contractDrafts[i].interestRate)) *
+    //         this.form.contractDrafts[i].limitTime) /
+    //         360 +
+    //         1) *
+    //         this.form.contractDrafts[i].interestRate *
+    //         this.form.contractDrafts[i].limitTime) /
+    //       360
+    //     ).toFixed(2)
+    //   }
+    // }
   }
 }
 </script>

src/views/form/index.vue

@@ -258,13 +258,13 @@ export default {
             type: "success",
             message: "恢复成功",
           });
-          this.getData();
+          this.getAllList();
         } else {
           this.$message({
             type: "danger",
             message: "恢复失败",
           });
-          this.getData();
+          this.getAllList();
         }
       });
     },
@@ -282,13 +282,13 @@ export default {
             type: "success",
             message: "删除成功",
           });
-          this.getData();
+          this.getAllList();
         } else {
           this.$message({
             type: "danger",
             message: "删除失败",
           });
-          this.getData();
+          this.getAllList();
         }
       });
     },

src/views/management/index.vue

@@ -275,13 +275,13 @@ export default {
             type: "success",
             message: res.msg,
           });
-          this.getData();
+          this.getAllList();
         } else {
           this.$message({
-            type: "danger",
+            type: "error",
             message: res.msg,
           });
-          this.getData();
+          this.getAllList();
         }
       });
     },
@@ -300,13 +300,13 @@ export default {
             type: "success",
             message: res.msg,
           });
-          this.getData();
+          this.getAllList();
         } else {
           this.$message({
-            type: "danger",
+            type: "error",
             message: res.msg,
           });
-          this.getData();
+          this.getAllList();
         }
       });
     },
@@ -325,13 +325,13 @@ export default {
             type: "success",
             message: "恢复成功",
           });
-          this.getData();
+          this.getAllList();
         } else {
           this.$message({
-            type: "danger",
+            type: "error",
             message: "恢复失败",
           });
-          this.getData();
+          this.getAllList();
         }
       });
     },
@@ -350,13 +350,13 @@ export default {
             type: "success",
             message: "删除成功",
           });
-          this.getData();
+          this.getAllList();
         } else {
           this.$message({
-            type: "danger",
+            type: "error",
             message: "删除失败",
           });
-          this.getData();
+          this.getAllList();
         }
       });
     },
@@ -374,13 +374,13 @@ export default {
             type: "success",
             message: "恢复成功",
           });
-          this.getData();
+          this.getAllList();
         } else {
           this.$message({
-            type: "danger",
+            type: "error",
             message: "恢复失败",
           });
-          this.getData();
+          this.getAllList();
         }
       });
     },
@@ -398,13 +398,13 @@ export default {
             type: "success",
             message: "删除成功",
           });
-          this.getData();
+          this.getAllList();
         } else {
           this.$message({
-            type: "danger",
+            type: "error",
             message: "删除失败",
           });
-          this.getData();
+          this.getAllList();
         }
       });
     },
@@ -504,28 +504,35 @@ export default {
     },
     // 重置业务员密码
     reset(id) {
-      console.log(id);
       this.$prompt("请输入密码", "重置密码", {
         confirmButtonText: "确定",
         cancleButtonText: "取消",
       })
         .then(({ value }) => {
-          this.$request({
-            url: "/api/Account/password/resetUser",
-            method: "post",
-            data: {
-              password: value,
-              userId: id,
-            },
-          }).then((res) => {
-            console.log(res);
-            if (res.code === 200) {
-              this.$message({
-                type: "success",
-                message: "重置成功",
-              });
-            }
-          });
+					if(value.length<6){
+						this.$message({
+							type:'error',
+							message:'密码至少六位'
+						})
+					}else{
+						this.$request({
+						  url: "/api/Account/password/resetUser",
+						  method: "post",
+						  data: {
+						    password: value,
+						    userId: id,
+						  },
+						}).then((res) => {
+						  console.log(res);
+						  if (res.code === 200) {
+						    this.$message({
+						      type: "success",
+						      message: "重置成功",
+						    });
+						  }
+						});
+					}
+          
         })
         .catch(() => {
           this.$message({

src/views/sucuirtyaudit/annexList.vue

@@ -286,9 +286,6 @@ export default {
       font.handleCurrentChange(cpage);
     },
 
-
-
-
     handleSelectionChange(data) {
       this.multipleSelection = data;
       console.log(this.multipleSelection);
@@ -341,6 +338,7 @@ export default {
     },
   },
 };
+
 </script>
 <style lang="scss">
 .pulldown {

src/views/sucuirtyaudit/detail.vue

@@ -1,29 +1,51 @@
 <template>
 	<div>
-		<el-descriptions title="详情信息" :column="2" :size="size" border >
+		<el-descriptions title="详情信息" :column="2" border>
 			<el-descriptions-item label="姓名">{{tableData.userName}}</el-descriptions-item>
 			<el-descriptions-item label="状态">{{tableData.status}}</el-descriptions-item>
 			<el-descriptions-item label="id">{{tableData.recordId}}</el-descriptions-item>
 			<el-descriptions-item label="事件名称">{{tableData.event}}</el-descriptions-item>
 		</el-descriptions>
-		<!-- <el-table
-		    :data="tableData"
-		    stripe
-		    style="width: 100%">
-		    <el-table-column
-		      prop="date"
-		      label="日期"
-		      width="180">
-		    </el-table-column>
-		</el-table> -->
+		<el-collapse  @change="handleChange">
+			<el-collapse-item title="更新前" name="1">
+			  <el-table :data="beforeobj.columns"  border>
+			  	<el-table-column label="列表名" prop="columnName">
+			  	</el-table-column>
+			  	<el-table-column prop="columnDescription" label="描述" >
+			  	</el-table-column>
+			  	<el-table-column prop="isPrimaryKey" label="主键" >
+			  	</el-table-column>
+			  	<el-table-column prop="value" label="值" >
+						<!-- <template slot-scope="scope">
+							<img width='100' height="100" v-for="item in scope.row.value" :src="item">
+						</template> -->
+			  	</el-table-column>
+			  </el-table>
+			</el-collapse-item>
+		  <el-collapse-item title="更新后" name="2">
+		    <el-table :data="afterobj.columns"  border>
+		    	<el-table-column label="列表名" prop="columnName">
+		    	</el-table-column>
+		    	<el-table-column prop="columnDescription" label="描述" >
+		    	</el-table-column>
+		    	<el-table-column prop="isPrimaryKey" label="主键" >
+		    	</el-table-column>
+		    	<el-table-column prop="value" label="值" >
+		    	</el-table-column>
+		    </el-table>
+		  </el-collapse-item>
+		</el-collapse>
 	</div>
-	
+
 </template>
 
 <script>
 	export default {
 		data() {
 			return {
+				activeNames:['1'],
+				afterobj: {},
+				beforeobj:{},
 				tableData: {},
 			}
 		},
@@ -33,12 +55,16 @@
 				url: '/api/AuditLog/detail/' + id,
 				method: 'get',
 			}).then((res) => {
-				this.tableData=res.data
+				this.tableData = res.data
 				console.log(this.tableData)
-				let string=res.data.after
-				let obj=eval('('+string+')')
-				console.log(obj)
+				this.afterobj = JSON.parse(res.data.after)
+				this.beforeobj=JSON.parse(res.data.before)
+				console.log(this.afterobj, "更新后")
 			})
+		},
+		methods:{
+			handleChange(){
+			}
 		}
 	}
 </script>