Tartarus 2 lat temu
rodzic
commit
f3f2002dcb

+ 15 - 8
src/views/contracts/billDetail.vue

xqd xqd xqd
@@ -86,16 +86,19 @@ export default {
   mounted() {
     this.checked = this.$store.state.user.checked
     this.feed.id = this.$route.query.id
-    const id = this.$route.query.id
-    this.$request({
-      url: '/api/Contract/contractDraft/' + id,
-      method: 'get'
-    }).then((res) => {
-      this.list.push(res.data)
-      console.log(this.list)
-    })
+    this.getData()
   },
   methods: {
+		getData(){
+			const id = this.$route.query.id
+			this.$request({
+			  url: '/api/Contract/contractDraft/' + id,
+			  method: 'get'
+			}).then((res) => {
+			  this.list.push(res.data)
+			  console.log(this.list)
+			})
+		},
     success() {
       this.feed.approveStatus = 1
       this.$request({
@@ -108,11 +111,13 @@ export default {
             type: 'success',
             message: '提交成功'
           })
+		  this.$router.go(0)
         } else {
           this.$message({
             type: 'success',
             message: '提交失败'
           })
+		  this.$router.go(0)
         }
       })
     },
@@ -128,11 +133,13 @@ export default {
             type: 'success',
             message: '提交成功'
           })
+		 this.$router.go(0)
         } else {
           this.$message({
             type: 'success',
             message: '提交失败'
           })
+		  this.$router.go(0)
         }
       })
     },

+ 36 - 19
src/views/contracts/detail.vue

xqd xqd xqd xqd xqd xqd xqd xqd
@@ -178,11 +178,13 @@
               type="success"
               style="margin-right: 15px;cursor: pointer;"
               @click="recover(scope.row.id)"
+			  v-if="(scope.row.draftStatus==1)"
             >恢复</el-tag>
             <el-tag
               type="danger"
               style="margin-right: 15px;cursor: pointer;"
               @click="deleted(scope.row.id)"
+			   v-if="(scope.row.draftStatus==0)"
             >删除</el-tag>
           </template>
         </el-table-column>
@@ -257,21 +259,24 @@ export default {
   created() {},
   mounted() {
     this.checked = this.$store.state.user.checked
-    const id = this.$route.query.id
-    this.$request({
-      url: '/api/Contract/' + id,
-      method: 'get'
-    }).then((res) => {
-      this.contract = res.data
-      this.url = this.contract.invoicePicList
-      this.picList = this.contract.picList
-      this.list = res.data.contractDraft.result
-      this.feed.feedbackPicList = this.picList
-      this.feed.id = this.$route.query.id
-      this.getPageData()
-    })
+   this.getData()
   },
   methods: {
+		getData(){
+			const id = this.$route.query.id
+			this.$request({
+			  url: '/api/Contract/' + id,
+			  method: 'get'
+			}).then((res) => {
+			  this.contract = res.data
+			  this.url = this.contract.invoicePicList
+			  this.picList = this.contract.picList
+			  this.list = res.data.contractDraft.result
+			  this.feed.feedbackPicList = this.picList
+			  this.feed.id = this.$route.query.id
+			  this.getPageData()
+			})
+		},
     addNewBill() {
       this.$router.push({
         path: 'contracts/addnewbill'
@@ -339,11 +344,13 @@ export default {
             type: 'success',
             message: res.msg
           })
+		  this.getData()
         } else {
           this.$message({
-            type: 'danger',
+            type: 'error',
             message: '提交失败'
           })
+		  this.getData()
         }
       })
     },
@@ -359,11 +366,13 @@ export default {
             type: 'success',
             message: res.msg
           })
+		  this.getData()
         } else {
           this.$message({
-            type: 'danger',
+            type: 'error',
             message: '提交失败'
           })
+		  this.getData()
         }
       })
     },
@@ -382,11 +391,13 @@ export default {
             type: 'success',
             message: res.msg
           })
+		  this.getData()
         } else {
           this.$message({
-            type: 'danger',
+            type: 'error',
             message: '提交失败'
           })
+		  this.getData()
         }
       })
     },
@@ -405,11 +416,13 @@ export default {
             type: 'success',
             message: res.msg
           })
+		  this.getData()
         } else {
           this.$message({
-            type: 'danger',
+            type: 'error',
             message: '提交失败'
           })
+		  this.getData()
         }
       })
     },
@@ -427,11 +440,13 @@ export default {
             type: 'success',
             message: res.msg
           })
+		  this.getData()
         } else {
           this.$message({
-            type: 'danger',
+            type: 'error',
             message: '提交失败'
           })
+		  this.getData()
         }
       })
     },
@@ -449,11 +464,13 @@ export default {
             type: 'success',
             message: res.msg
           })
+		  this.getData()
         } else {
           this.$message({
-            type: 'danger',
+            type: 'error',
             message: '提交失败'
           })
+		  this.getData()
         }
       })
     },

+ 2 - 1
src/views/contracts/index.vue

xqd xqd
@@ -113,7 +113,7 @@
     <div style="display: flex;justify-content: space-between;">
       <el-row type="flex" justify="space-between">
         <div class="btn" style="display: flex; justify-content: flex-end">
-          <el-button v-if="checked === 1" type="primary" @click="addNewContract">上传合同</el-button>
+          <el-button  type="primary" @click="addNewContract">上传合同</el-button>
           <el-button v-if="checked === 0" type="primary" @click="failed">审核失败</el-button>
           <el-button v-if="checked === 0" type="primary" @click="successed">审核成功</el-button>
           <el-button type="primary" @click="Exports">批量导出</el-button>
@@ -226,6 +226,7 @@ export default {
   },
   mounted() {
     this.checked = this.$store.state.user.checked
+	console.log(this.checked)
     // this.$request({
     //   url: '/api/Contract/search',
     //   method: 'post',

+ 421 - 554
src/views/contracts/new_file.vue

xqd
@@ -1,599 +1,466 @@
 <template>
-  <div class="app-container">
-    <el-card class="box-card" style="padding: 20px 10px; margin-bottom: 20px">
-      <div class="contract">
-        <div>
-          <p>合同名称</p>
-          <el-input
-            v-model="form.name"
-            placeholder="请输入合同名称"
-            style="width: 500px"
-            clearable
-            @input="getContractNo"
-          />
-        </div>
-        <div>
-          <p>合同编号</p>
-          <el-input
-            v-model="form.contractNo"
-            placeholder="请输入合同编号"
-            style="width: 500px"
-            disabled
-          />
-        </div>
-      </div>
+	<div class="app-container">
+		<el-card class="box-card" style="padding: 20px 10px; margin-bottom: 20px">
+			<div class="contract">
+				<div>
+					<p>合同名称</p>
+					<el-input v-model="form.name" placeholder="请输入合同名称" style="width: 500px" clearable
+						@input="getContractNo" />
+				</div>
+				<div>
+					<p>合同编号</p>
+					<el-input v-model="form.contractNo" placeholder="请输入合同编号" style="width: 500px" disabled />
+				</div>
+			</div>
 
-      <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"
-          :auto-upload="false"
-          :on-change="handlepics"
-          :file-list="form.pics"
-        >
-          <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">
+			<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" :auto-upload="false"
+					:on-change="handlepics" :file-list="form.pics">
+					<i slot="default" class="el-icon-plus" />
+					<div slot="file" slot-scope="{ file }">
+						<img class="el-upload-list__item-thumbnail" :src="file.url" alt="">
+
+					</div>
+				</el-upload>
+				<el-dialog :visible.sync="dialogVisible">
+					<img width="100%" :src="form.pics" alt="">
+				</el-dialog>
+			</div>
+			<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" :auto-upload="false"
+					:on-change="handleinvoicePics" :file-list="form.invoicePics">
+					<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"></i>
 							</span>
-							<span v-if="!disabled" class="el-upload-list__item-delete"
-								@click="handleDownload(file)">
+							<span v-if="!disabled" class="el-upload-list__item-delete" @click="handleDownload(file)">
 								<i class="el-icon-download"></i>
 							</span>
 							<span v-if="!disabled" class="el-upload-list__item-delete" @click="handleRemove(file)">
 								<i class="el-icon-delete"></i>
 							</span>
 						</span> -->
-          </div>
-        </el-upload>
-        <el-dialog :visible.sync="dialogVisible">
-          <img width="100%" :src="form.pics" alt="">
-        </el-dialog>
-      </div>
-      <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"
-          :auto-upload="false"
-          :on-change="handleinvoicePics"
-          :file-list="form.invoicePics"
-        >
-          <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">
+					</div>
+				</el-upload>
+				<el-dialog :visible.sync="dialogVisible">
+					<img width="100%" :src="form.invoicePics" alt="">
+				</el-dialog>
+			</div>
+			<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" :auto-upload="false"
+					:on-change="handletradePics" :file-list="form.tradePics">
+					<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"></i>
+								<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"></i>
+								<i class="el-icon-download" />
 							</span>
 							<span v-if="!disabled" class="el-upload-list__item-delete" @click="handleRemove(file)">
-								<i class="el-icon-delete"></i>
+								<i class="el-icon-delete" />
 							</span>
-						</span> -->
-          </div>
-        </el-upload>
-        <el-dialog :visible.sync="dialogVisible">
-          <img width="100%" :src="form.invoicePics" alt="">
-        </el-dialog>
-      </div>
-      <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"
-          :auto-upload="false"
-          :on-change="handletradePics"
-          :file-list="form.tradePics"
-        >
-          <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="form.tradePics" alt="">
-        </el-dialog>
-      </div>
-    </el-card>
+						</span>
+					</div>
+				</el-upload>
+				<el-dialog :visible.sync="dialogVisible">
+					<img width="100%" :src="form.tradePics" alt="">
+				</el-dialog>
+			</div>
+		</el-card>
 
-    <div v-for="(item, index) in form.contractDrafts" class="form">
-      <el-button type="primary" @click="deletedraft(index)">删除汇票</el-button>
-      <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>
+		<div v-for="(item, index) in form.contractDrafts" class="form">
+			<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="选择日期"
-            @change="
+				<el-form-item label="预计贴现日">
+					<el-date-picker v-model="item.expectDiscountDate" type="date" placeholder="选择日期" @change="
               changeE;
               xpectDiscountDate($event, index);
-            "
-          />
-        </el-form-item>
-        <el-form-item label="出票日期">
-          <el-date-picker
-            v-model="item.acceptDate"
-            type="date"
-            placeholder="选择日期"
-            class="ipwidth"
-          />
-        </el-form-item>
-        <el-form-item label="承兑日期">
-          <el-date-picker
-            v-model="item.issueDate"
-            type="date"
-            placeholder="选择日期"
-            @change="changeIssueDate($event, index)"
-          />
-        </el-form-item>
-        <el-form-item label="到期日期">
-          <el-date-picker
-            v-model="item.expireDate"
-            type="date"
-            placeholder="选择日期"
-          />
-        </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"
-            @change="computed"
-          />
-        </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
+            " />
+				</el-form-item>
+				<el-form-item label="出票日期">
+					<el-date-picker v-model="item.acceptDate" type="date" placeholder="选择日期" class="ipwidth" />
+				</el-form-item>
+				<el-form-item label="承兑日期">
+					<el-date-picker v-model="item.issueDate" type="date" placeholder="选择日期"
+						@change="changeIssueDate($event, index)" />
+				</el-form-item>
+				<el-form-item label="到期日期">
+					<el-date-picker v-model="item.expireDate" type="date" placeholder="选择日期" />
+				</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"
+						@change="computed" />
+				</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"
               :label="item"
               :value="item"
             /> -->
-          </el-select>
-        </el-form-item>
-        <el-form-item label="承兑人">
-          <el-select v-model="form.acceptorName" placeholder="请选择承兑人">
-            <!-- <el-option
+					</el-select>
+				</el-form-item>
+				<el-form-item label="承兑人">
+					<el-select v-model="form.acceptorName" placeholder="请选择承兑人">
+						<!-- <el-option
               v-for="val in acceptorName"
               :label="val"
               :value="val"
               @click.native="getRate"
             /> -->
-          </el-select>
-        </el-form-item>
+					</el-select>
+				</el-form-item>
+
+				<el-form-item label="服务费率">
+					<el-input v-model="item.serviceRate" class="ipwidth" placeholder="服务费率" style="width: 220px"
+						@input="inputServiceRate($event, index)" />
+				</el-form-item>
+				<el-form-item label="利率">
+					<el-input v-model="item.interestRate" class="ipwidth" placeholder="利率" style="width: 220px"
+						@input="inputInterestRate($event, 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 accept=".pdf, .jpg, .jpeg, .png" action="https://ht.9026.com/api/File"
+								list-type="picture-card" :show-file-list="true" :auto-upload="false"
+								:before-upload="beforeUpload" :on-change="handlepicUrls(file,fileList,index)"
+								:file-list="form.contractDrafts[index].picUrls"> -->
+							<el-upload action="https://ht.9026.com/api/File" list-type="picture-card" :auto-upload="false"
+								:on-change="handlepicUrls(file,fileList,index)" :file-list="form.contractDrafts[index].picUrls">
+								<i class="el-icon-plus" />
+							</el-upload>
+							<el-dialog :visible.sync="dialogVisible">
+								<img width="100%" :src="form.contractDrafts[index].picUrls" alt="">
+							</el-dialog>
+						</div>
+					</el-col>
+				</el-row>
+				<el-button type="primary" @click="deletedraft(index)"
+					style="width: 100px;height: 50px;margin-top: 50px;">删除汇票</el-button>
+			</div>
 
-        <el-form-item label="服务费率">
-          <el-input
-            v-model="item.serviceRate"
-            class="ipwidth"
-            placeholder="服务费率"
-            style="width: 220px"
-            @input="inputServiceRate($event, index)"
-          />
-        </el-form-item>
-        <el-form-item label="利率">
-          <el-input
-            v-model="item.interestRate"
-            class="ipwidth"
-            placeholder="利率"
-            style="width: 220px"
-            @input="inputInterestRate($event, inde)"
-          />
-        </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
-                accept=".pdf, .jpg, .jpeg, .png"
-                action="https://ht.9026.com/api/File"
-                :file-list="fileArr"
-                list-type="picture-card"
-                :show-file-list="true"
-                :auto-upload="false"
-                :before-upload="beforeUpload"
-                :on-change="handlepicUrls"
-              >
-                <i class="el-icon-plus" />
-              </el-upload>
-              <el-dialog :visible.sync="dialogVisible">
-                <img width="100%" :src="form.contractDrafts.picUrls" alt="">
-              </el-dialog>
-            </div>
-          </el-col>
-        </el-row>
-      </div>
-    </div>
+		</div>
 
-    <div class="commit">
-      <div class="addnew">
-        <el-button type="primary" @click="adddraft">新增汇票</el-button>
-      </div>
-      <div class="addall">
-        <el-button
-          type="warning"
-          style="width: 180px; height: 45px; font-size: 16px"
-          @click="onSubmit"
-        >确认上传
-        </el-button>
-      </div>
-    </div>
-  </div>
+		<div class="commit">
+			<div class="addnew">
+				<el-button type="primary" @click="adddraft">新增汇票</el-button>
+			</div>
+			<div class="addall">
+				<el-button type="warning" style="width: 180px; height: 45px; font-size: 16px" @click="onSubmit">确认上传
+				</el-button>
+			</div>
+		</div>
+	</div>
 </template>
 
 <script>
-export default {
-  data() {
-    return {
-      dialogVisible: false,
-      disabled: false,
-      drawersList: [],
-      acceptorList: [],
-      contractList: [],
-      form: {
-        // 承兑人列表
-        acceptorName: [],
-        // 出票人列表
-        drawersName: [],
-        contractNo: '',
-        supplierId: 2,
-        name: '',
-        invoicePics: [],
-        pics: [],
-        tradePics: [],
-        contractDrafts: [
-          {
-            name: '',
-            draftNo: 'HP20220709-0958-02356',
-            acceptorId: '',
-            drawersId: '',
-            money: '',
-            acceptDate: '',
-            loanLimit: '',
-            serviceRate: '',
-            serviceMoney: '',
-            interestRate: '',
-            interest: '',
-            picUrls: [
-              'https://easygolf.oss-ap-southeast-6.aliyuncs.com/golf/2022-03/18/88df7532ff7de229b617.jpg'
-            ],
-            expectDiscountDate: '',
-            issueDate: '',
-            expireDate: ''
-          }
-        ]
-      },
-      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)
-            }
-          }
-        ]
-      }
-    }
-  },
+	export default {
+		data() {
+			return {
+				dialogVisible: false,
+				disabled: false,
+				drawersList: [],
+				acceptorList: [],
+				contractList: [],
+				form: {
+					// 承兑人列表
+					acceptorName: [],
+					// 出票人列表
+					drawersName: [],
+					contractNo: '',
+					supplierId: 2,
+					name: '',
+					invoicePics: [],
+					pics: [],
+					tradePics: [],
+					contractDrafts: [{
+						name: '',
+						draftNo: '',
+						acceptorId: '',
+						drawersId: '',
+						money: '',
+						acceptDate: '',
+						loanLimit: '',
+						serviceRate: '',
+						serviceMoney: '',
+						interestRate: '',
+						interest: '',
+						picUrls:[],
+						expectDiscountDate: '',
+						issueDate: '',
+						expireDate: ''
+					}]
+				},
+				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)
+							}
+						}
+					]
+				}
+			}
+		},
 
-  mounted() {
-    this.$request({
-      url: '/api/Contract/search',
-      method: 'post',
-      data: {
-        pageIndex: 1,
-        pageSize: 100
-      }
-    }).then((res) => {
-      this.contractList = res.data.result
-    })
-    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)
-      console.log(this.acceptorName)
-      // 去除重复的承兑人
-      //  for (var i = 0; i < this.acceptorName.length; i++) {    // 首次遍历数组
-      //         for (var j = i + 1; j < this.acceptorName.length; j++) {   // 再次遍历数组
-      //             if (this.acceptorName[i] === this.acceptorName[j]) {          // 判断连个值是否相等
-      //                 this.acceptorName.splice(j, 1);           // 相等删除后者
-      //                 j--;
-      //             }
-      //         }
-      //     }
-      // console.log(this.acceptorName)
-    })
-    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--
-          }
-        }
-      }
-      console.log(this.drawersName)
-    })
-  },
-  methods: {
-    onSubmit() {
-      console.log(this.form)
-      // this.$request({
-      // 	url: '/api/Contract',
-      // 	method: 'post',
-      // 	data: this.form
-      // }).then((res) => {
-      // 	console.log(res)
-      // 	this.$message({
-      // 		message:'上传成功',
-      // 		type:'success'
-      // 	})
-      // })
-    },
-    handlepics(file, fileList) {
-      console.log(file, fileList)
-      // this.form.pics.push(file)
-      this.form.pics = fileList
-      console.log(this.form.pics)
-    },
-    handleinvoicePics(file, fileList) {
-      // this.form.invoicePics.push(file)
-      this.form.invoicePics = fileList
-      console.log(this.form.invoicePics)
-    },
-    handletradePics(file, fileList) {
-      // this.form.tradePics.push(file)
-      this.form.tradePics = fileList
-      console.log(this.form.tradePics)
-    },
-    handlepicUrls(file, fileList, index) {
-      // this.form.contractDrafts[0].picUrls.push(file)
-      console.log(this.form.contractDrafts[index].picUrls)
-    },
-    getContractNo() {
-      const temporaryList = this.contractList.filter(
-        (item) => item.name === this.form.name
-      )
-      if (this.form.name === '' || temporaryList === '') {
-        this.form.contractNo = ''
-      } else {
-        this.form.contractNo = temporaryList[0].contractNo
-      }
-    },
-    getRate() {
-      const list = this.acceptorList.filter(
-        (item) => item.name === this.form.acceptorName
-      )
-      this.form.contractDrafts[0].interestRate = list[0].interest
-      this.form.contractDrafts[0].serviceRate = list[0].serviceRate
-    },
-    computed() {
-      console.log(this.form.contractDrafts[0].money)
-    },
-    addDrawer() {
-      this.$router.push({
-        path: '/form/addTicketdrawer'
-      })
-    },
-    adddraft() {
-      this.form.contractDrafts.push({
-        name: '',
-        draftNo: 'HP20220709-0958-02356',
-        acceptorId: '',
-        drawersId: '',
-        money: '',
-        acceptDate: '',
-        loanLimit: '',
-        serviceRate: '',
-        serviceMoney: '',
-        interestRate: '',
-        interest: '',
-        picUrls: [
-          'https://easygolf.oss-ap-southeast-6.aliyuncs.com/golf/2022-03/18/88df7532ff7de229b617.jpg'
-        ],
-        expectDiscountDate: '',
-        issueDate: '',
-        expireDate: ''
-      })
-    },
+		mounted() {
+			this.$request({
+				url: '/api/Contract/search',
+				method: 'post',
+				data: {
+					pageIndex: 1,
+					pageSize: 100
+				}
+			}).then((res) => {
+				this.contractList = res.data.result
+			})
+			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)
+				console.log(this.acceptorName)
+				// 去除重复的承兑人
+				//  for (var i = 0; i < this.acceptorName.length; i++) {    // 首次遍历数组
+				//         for (var j = i + 1; j < this.acceptorName.length; j++) {   // 再次遍历数组
+				//             if (this.acceptorName[i] === this.acceptorName[j]) {          // 判断连个值是否相等
+				//                 this.acceptorName.splice(j, 1);           // 相等删除后者
+				//                 j--;
+				//             }
+				//         }
+				//     }
+				// console.log(this.acceptorName)
+			})
+			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--
+						}
+					}
+				}
+				console.log(this.drawersName)
+			})
+		},
+		methods: {
+			onSubmit() {
+				console.log(this.form)
+				// this.$request({
+				// 	url: '/api/Contract',
+				// 	method: 'post',
+				// 	data: this.form
+				// }).then((res) => {
+				// 	console.log(res)
+				// 	this.$message({
+				// 		message:'上传成功',
+				// 		type:'success'
+				// 	})
+				// })
+			},
+			handlepics(file, fileList) {
+				console.log(file, fileList)
+				// this.form.pics.push(file)
+				this.form.pics = fileList
+				console.log(this.form.pics)
+			},
+			handleinvoicePics(file, fileList) {
+				// this.form.invoicePics.push(file)
+				this.form.invoicePics = fileList
+				console.log(this.form.invoicePics)
+			},
+			handletradePics(file, fileList) {
+				// this.form.tradePics.push(file)
+				this.form.tradePics = fileList
+				console.log(this.form.tradePics)
+			},
+			handlepicUrls(file, fileList, index) {
+				this.form.contractDrafts[index].picUrls = fileList
+				console.log(this.form.contractDrafts[index])
+			},
+			getContractNo() {
+				const temporaryList = this.contractList.filter(
+					(item) => item.name === this.form.name
+				)
+				if (this.form.name === '' || temporaryList === '') {
+					this.form.contractNo = ''
+				} else {
+					this.form.contractNo = temporaryList[0].contractNo
+				}
+			},
+			getRate() {
+				const list = this.acceptorList.filter(
+					(item) => item.name === this.form.acceptorName
+				)
+				this.form.contractDrafts[0].interestRate = list[0].interest
+				this.form.contractDrafts[0].serviceRate = list[0].serviceRate
+			},
+			computed() {
+				console.log(this.form.contractDrafts[0].money)
+			},
+			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: ''
+				})
+			},
 
-    deletedraft(index) {
-      const contractDraftsLength = this.form.contractDrafts.length
-      if (contractDraftsLength > 1) {
-        this.form.contractDrafts.splice(index, 1)
-      } else {
-        this.$message.error('至少一个')
-      }
-      console.log(this.form.contractDrafts[0].money)
-    },
-    // 服务费率
-    inputServiceRate(val, index) {
-      console.log(val, index)
-    },
-    // 利率
-    inputInterestRate(val, index) {
-      console.log(val, index)
-    },
-    // 预计贴现日
-    changeExpectDiscountDate(val, index) {
-      console.log(val, index)
-    },
-    // 承兑日期
-    changeIssueDate(val, index) {
-      console.log(val, index)
-    }
-  }
-}
+			deletedraft(index) {
+				const contractDraftsLength = this.form.contractDrafts.length
+				if (contractDraftsLength > 1) {
+					this.form.contractDrafts.splice(index, 1)
+				} else {
+					this.$message.error('至少一个')
+				}
+				console.log(this.form.contractDrafts[0].money)
+			},
+			// 服务费率
+			inputServiceRate(val, index) {
+				console.log(val, index)
+			},
+			// 利率
+			inputInterestRate(val, index) {
+				console.log(val, index)
+			},
+			// 预计贴现日
+			changeExpectDiscountDate(val, index) {
+				console.log(val, index)
+			},
+			// 承兑日期
+			changeIssueDate(val, index) {
+				console.log(val, index)
+			}
+		}
+	}
 </script>
 
 <style lang="scss">
-.contract {
-  display: flex;
-  justify-content: space-between;
-  margin-bottom: 20px;
-}
+	.contract {
+		display: flex;
+		justify-content: space-between;
+		margin-bottom: 20px;
+	}
 
-.form {
-  display: flex;
-  justify-content: space-around;
-}
+	.form {
+		display: flex;
+		justify-content: space-around;
+	}
 
-.addnew {
-  display: flex;
-  justify-content: flex-end;
-}
+	.addnew {
+		display: flex;
+		justify-content: flex-end;
+	}
 
-.addall {
-  display: flex;
-  justify-content: center;
-}
+	.addall {
+		display: flex;
+		justify-content: center;
+	}
 
-.commit {
-  margin: 20px 0;
-}
+	.commit {
+		margin: 20px 0;
+	}
 </style>

+ 53 - 27
src/views/delivery/index.vue

xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd
@@ -74,7 +74,10 @@
 			<el-table-column label="电话" width="180" align="center" prop="contactsMobile">
 	
 			</el-table-column>
-			<el-table-column label="审核状态"  align="center" prop="statusText">
+			<el-table-column label="供应商状态" width="180" align="center" prop="statusText">
+				
+			</el-table-column>
+			<el-table-column label="状态"  align="center" prop="isDeletedText">
 		
 			</el-table-column>
 			<el-table-column align="center" prop="createdAt" label="时间" width="180">
@@ -83,8 +86,8 @@
 				<template slot-scope="scope">
 					<el-tag type="primary" style="cursor: pointer;margin-right: 15px;" @click="toedit(scope.row.id)">编辑
 					</el-tag>
-					<el-tag type="success" style="margin-right: 15px;cursor: pointer;" @click="Srecover(scope.row.id)">恢复</el-tag>
-					<el-tag type="danger" style="margin-right: 15px;cursor: pointer;"  @click="Sdeleted(scope.row.id)">禁用</el-tag>
+					<el-tag type="success" style="margin-right: 15px;cursor: pointer;" @click="Srecover(scope.row.id)" v-if="scope.row.isDeleted==1">恢复</el-tag>
+					<el-tag type="danger" style="margin-right: 15px;cursor: pointer;"  @click="Sdeleted(scope.row.id)" v-if="scope.row.isDeleted==0">禁用</el-tag>
 				</template>
 			</el-table-column>
 		</el-table>
@@ -93,7 +96,7 @@
 				<div class="btn" style="display: flex;justify-content: flex-end;">
 						<el-button type="primary" @click="failed">审核失败</el-button>
 						<el-button type="primary" @click="success">审核成功</el-button>
-						<el-button type="primary" @click="Exports">导出</el-button>
+						<el-button type="primary" @click="Exports">批量导出</el-button>
 						<el-button type="success" @click="recover">恢复</el-button>
 						<el-button type="danger" @click="deleted">禁用</el-button>
 					</div>
@@ -180,20 +183,23 @@
 		created() {
 		},
 		mounted() {
-			this.$request({
-				url: "/api/Supplier/search",
-				method: 'post',
-				data: {
-					pageIndex: 1,
-					pageSize:100,
-				}
-			}).then((res) => {
-				this.list = res.data.result
-				this.getPageData();
-				console.log(this.list)
-			})
+			this.getData()
 		},
 		methods: {
+			getData(){
+				this.$request({
+					url: "/api/Supplier/search",
+					method: 'post',
+					data: {
+						pageIndex: 1,
+						pageSize:100,
+					}
+				}).then((res) => {
+					this.list = res.data.result
+					this.getPageData();
+					console.log(this.list)
+				})
+			},
 			handleSelectionChange(data){
 				this.multipleSelection = data;
 				console.log(this.multipleSelection);
@@ -259,17 +265,25 @@
 				this.AuditStatus=""
 			},
 			Exports(){
-				var tableHeader = [
-					['序号','供应商名称','社会统一信用码', '账号', '法人名称', '联系人', '电话', '审核状态', '时间'],
-				]
-				var dataList = []
-				this.multipleSelection.forEach((item, index) => {
-					dataList.push([index + 1, item.name, item.socialCode, item.account, item.legalPerson, item
-						.contacts,item.contactsMobile, item.statusText, item.createdAt
-					]);
-				})
-				dataConversionUtil.dataToExcel('供应商列表', tableHeader, dataList)
-				this.$message.success('导出成功!');
+				if(this.multipleSelection==""){
+					this.$message({
+						type:'warning',
+						message:'请选择数据!'
+					})
+				}else{
+					var tableHeader = [
+						['序号','供应商名称','社会统一信用码', '账号', '法人名称', '联系人', '电话', '审核状态', '时间'],
+					]
+					var dataList = []
+					this.multipleSelection.forEach((item, index) => {
+						dataList.push([index + 1, item.name, item.socialCode, item.account, item.legalPerson, item
+							.contacts,item.contactsMobile, item.statusText, item.createdAt
+						]);
+					})
+					dataConversionUtil.dataToExcel('供应商列表', tableHeader, dataList)
+					this.$message.success('导出成功!');
+				}
+				
 			},
 			success(){
 				let ids=Array.from(this.multipleSelection,({id})=>id)
@@ -286,11 +300,13 @@
 							type:'success',
 							message:res.msg
 						})
+						this.getData()
 					}else{
 						this.$message({
 							type:'danger',
 							message:res.msg
 						})
+						this.getData()
 					}
 				})
 			},
@@ -309,11 +325,13 @@
 							type:'success',
 							message:res.msg
 						})
+						this.getData()
 					}else{
 						this.$message({
 							type:'danger',
 							message:res.msg
 						})
+						this.getData()
 					}
 				})
 			},
@@ -332,11 +350,13 @@
 							type:'success',
 							message:res.msg
 						})
+						this.getData()
 					}else{
 						this.$message({
 							type:'danger',
 							message:res.msg
 						})
+						this.getData()
 					}
 				})
 			},
@@ -354,11 +374,13 @@
 							type:'success',
 							message:res.msg
 						})
+						this.getData()
 					}else{
 						this.$message({
 							type:'danger',
 							message:res.msg
 						})
+						this.getData()
 					}
 				})
 			},
@@ -377,11 +399,13 @@
 							type:'success',
 							message:res.msg
 						})
+						this.getData()
 					}else{
 						this.$message({
 							type:'danger',
 							message:res.msg
 						})
+						this.getData()
 					}
 				})
 			},
@@ -399,11 +423,13 @@
 							type:'success',
 							message:res.msg
 						})
+						this.getData()
 					}else{
 						this.$message({
 							type:'danger',
 							message:res.msg
 						})
+						this.getData()
 					}
 				})
 			}

+ 0 - 10
src/views/form/detail.vue

xqd
@@ -1,14 +1,4 @@
 <template>
-	<!-- <el-descriptions title="详情信息">
-    <el-descriptions-item label="姓名">{{tableData.name}}</el-descriptions-item>
-    <el-descriptions-item label="id">{{tableData.id}}</el-descriptions-item>
-    <el-descriptions-item label="起始时间">{{tableData.createdAt}}</el-descriptions-item>
-		<el-descriptions-item label="结束时间">{{tableData.updatedAt}}</el-descriptions-item>
-    <el-descriptions-item label="银行账户">{{tableData.bankAccount}}</el-descriptions-item>
-    <el-descriptions-item label="银行名称">{{tableData.bankName}}</el-descriptions-item>
-		<el-descriptions-item label="deletedAt">{{tableData.deletedAt}}</el-descriptions-item>
-		<el-descriptions-item label="isDeleted">{{tableData.isDeleted}}</el-descriptions-item>
-</el-descriptions> -->
 	<div class="form">
 		<el-descriptions title="详情信息">
 			<el-descriptions-item label="id">{{tableData.id}}</el-descriptions-item>

+ 38 - 24
src/views/form/index.vue

xqd xqd xqd xqd xqd
@@ -76,12 +76,12 @@
 			</el-table-column>
 			<el-table-column align="center" prop="created_at" label="操作" width="250">
 				<template slot-scope="scope">
-					<el-tag type="primary" style="cursor: pointer; margin-right: 15px" @click="todetail(scope.row.id)">
+					<el-tag type="primary" style="cursor: pointer; margin-right: 15px" @click="todetail(scope.row.id)" >
 						详情</el-tag>
-					<el-tag type="success" style="cursor: pointer; margin-right: 15px" @click="recover(scope.row.id)">恢复
+					<el-tag type="success" style="cursor: pointer; margin-right: 15px" @click="recover(scope.row.id)" v-if="scope.row.status==1">恢复
 					</el-tag>
 					<el-tag type="danger" style="cursor: pointer; margin-right: 15px"
-						@click="deletestatus(scope.row.id)">删除</el-tag>
+						@click="deletestatus(scope.row.id)" v-if="scope.row.status==0">删除</el-tag>
 				</template>
 			</el-table-column>
 		</el-table>
@@ -176,17 +176,20 @@
 			// this.fetchData()
 		},
 		mounted() {
-			this.$request({
-				url: "/api/Drawer/search",
-				method: "post",
-				data: this.request,
-			}).then((res) => {
-				console.log(res.data.result);
-				this.list = res.data.result;
-				this.getPageData();
-			});
+			this.getData()
 		},
 		methods: {
+			getData(){
+				this.$request({
+					url: "/api/Drawer/search",
+					method: "post",
+					data: this.request,
+				}).then((res) => {
+					console.log(res.data.result);
+					this.list = res.data.result;
+					this.getPageData();
+				});
+			},
 			handleSelectionChange(data) {
 				this.multipleSelection = data;
 				console.log(this.multipleSelection);
@@ -237,11 +240,13 @@
 							type:'success',
 							message:'恢复成功'
 						})
+						this.getData()
 					}else{
 						this.$message({
 							type:'danger',
 							message:'恢复失败'
 						})
+						this.getData()
 					}
 				})
 			},
@@ -259,11 +264,13 @@
 							type:'success',
 							message:'删除成功'
 						})
+						this.getData()
 					}else{
 						this.$message({
 							type:'danger',
 							message:'删除失败'
 						})
+						this.getData()
 					}
 				})
 			},
@@ -296,18 +303,25 @@
 				}
 			},
 			Exports() {
-				var tableHeader = [
-					['序号', '出票人名称', '账号', '开户行名称', '状态', '时间'],
-				]
-				var dataList = []
-				this.multipleSelection.forEach((item, index) => {
-					dataList.push([index + 1, item.name, item.bankAccount, item.bankName, item.statusText, item
-						.createdAt
-					]);
-				})
-				dataConversionUtil.dataToExcel('出票人列表', tableHeader, dataList)
-				this.$message.success('导出成功!');
-
+				if(this.multipleSelection==""){
+					this.$message({
+						type:'warning',
+						message:'请选择数据!'
+					})
+				}else{
+					var tableHeader = [
+						['序号', '出票人名称', '账号', '开户行名称', '状态', '时间'],
+					]
+					var dataList = []
+					this.multipleSelection.forEach((item, index) => {
+						dataList.push([index + 1, item.name, item.bankAccount, item.bankName, item.statusText, item
+							.createdAt
+						]);
+					})
+					dataConversionUtil.dataToExcel('出票人列表', tableHeader, dataList)
+					this.$message.success('导出成功!');
+					
+				}
 			}
 		},
 	};

+ 2 - 1
src/views/login/index.vue

xqd xqd
@@ -61,7 +61,7 @@
               </el-form-item>
 
               <div class="registerbtn flex2">
-                <div class="forgect" @click.stop="registerNum">
+                <div class="forgect" @click="registerNum">
                   <p class="nes">新用户注册</p>
                 </div>
                 <div class="forgect" @click="open">
@@ -197,6 +197,7 @@ export default {
           return
         }
         this.$store.dispatch('user/ActionLogin', this.loginForm)
+		this.$store.commit('user/getAdmin', that.checked)
       })
     }
     //  handleLogin() {

+ 56 - 19
src/views/management/index.vue

xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd
@@ -45,7 +45,7 @@
         <el-button type="danger" @click="failed">审核失败</el-button>
         <el-button type="primary" @click="recover">恢复</el-button>
         <el-button type="warning" @click="deleted">删除</el-button>
-        <el-button type="primary">批量导出</el-button>
+        <el-button type="primary" @click="Exports">批量导出</el-button>
       </div>
     </el-row>
     <el-table
@@ -68,8 +68,8 @@
       <el-table-column align="center" prop="created_at" label="操作" width="200">
         <template slot-scope="scope">
           <el-tag type="primary" style="cursor: pointer; margin:0 5px;" @click="">编辑</el-tag>
-          <el-tag type="success" style="cursor: pointer; margin:0 5px;" @click="Srecover(scope.row.id)">恢复</el-tag>
-          <el-tag type="danger" style="cursor: pointer; margin:0 5px;" @click="Sdeleted(scope.row.id)">删除</el-tag>
+          <el-tag type="success" style="cursor: pointer; margin:0 5px;" @click="Srecover(scope.row.id)" v-if="scope.row.status==1">恢复</el-tag>
+          <el-tag type="danger" style="cursor: pointer; margin:0 5px;" @click="Sdeleted(scope.row.id)" v-if="scope.row.status==0">删除</el-tag>
         </template>
       </el-table-column>
     </el-table>
@@ -107,7 +107,9 @@
 import {
   getList
 } from '@/api/table'
-
+	import {
+		dataConversionUtil
+	} from '../../utils/Excel.js'
 export default {
   filters: {
     statusFilter(status) {
@@ -164,20 +166,23 @@ export default {
   created() {
   },
   mounted() {
-    this.$request({
-      url: '/api/Account/search',
-      method: 'post',
-      data: {
-        pageIndex: 0,
-        pageSize: 30
-      }
-    }).then((res) => {
-      this.list = res.data.result
-      console.log(res.data.result)
-      this.getPageData()
-    })
+   this.getData()
   },
   methods: {
+		getData(){
+				 this.$request({
+				   url: '/api/Account/search',
+				   method: 'post',
+				   data: {
+				     pageIndex: 0,
+				     pageSize: 30
+				   }
+				 }).then((res) => {
+				   this.list = res.data.result
+				   console.log(res.data.result)
+				   this.getPageData()
+				 })
+		},
     toDetail() {
       this.$router.push({
         path: '/detail'
@@ -230,11 +235,13 @@ export default {
             type: 'success',
             message: res.msg
           })
+		  this.getData()
         } else {
           this.$message({
             type: 'danger',
             message: res.msg
           })
+		  this.getData()
         }
       })
     },
@@ -253,11 +260,13 @@ export default {
             type: 'success',
             message: res.msg
           })
+		  this.getData()
         } else {
           this.$message({
             type: 'danger',
             message: res.msg
           })
+		  this.getData()
         }
       })
     },
@@ -276,11 +285,13 @@ export default {
             type: 'success',
             message: '恢复成功'
           })
+		  this.getData()
         } else {
           this.$message({
             type: 'danger',
             message: '恢复失败'
           })
+		  this.getData()
         }
       })
     },
@@ -299,11 +310,13 @@ export default {
             type: 'success',
             message: '删除成功'
           })
+		  this.getData()
         } else {
           this.$message({
             type: 'danger',
             message: '删除失败'
           })
+		  this.getData()
         }
       })
     },
@@ -321,11 +334,13 @@ export default {
             type: 'success',
             message: '恢复成功'
           })
+		  this.getData()
         } else {
           this.$message({
             type: 'danger',
             message: '恢复失败'
           })
+		  this.getData()
         }
       })
     },
@@ -341,16 +356,38 @@ export default {
         if (res.code == 200) {
           this.$message({
             type: 'success',
-            message: '恢复成功'
+            message: '删除成功'
           })
+		  this.getData()
         } else {
           this.$message({
             type: 'danger',
-            message: '恢复失败'
+            message: '删除失败'
           })
+		  this.getData()
         }
       })
-    }
+    },
+		Exports(){
+			if(this.multipleSelection==""){
+				this.$message({
+					type:'warning',
+					message:'请选择数据!'
+				})
+			}else{
+				var tableHeader = [
+					['序号', '业务管理员姓名', '账号', '联系电话', '业务管理员状态','审核状态', '时间'],
+				]
+				var dataList = []
+				this.multipleSelection.forEach((item, index) => {
+					dataList.push([index + 1, item.realName, item.account, item.mobile, item.statusText,item.approveStatusText, item
+						.createdAt
+					]);
+				})
+				dataConversionUtil.dataToExcel('业务管理员列表', tableHeader, dataList)
+				this.$message.success('导出成功!');
+		}
+		}
   }
 }
 </script>

+ 618 - 780
src/views/register/index.vue

xqd xqd xqd
@@ -1,332 +1,180 @@
 <template>
-  <div class="login-container">
-    <el-row>
-      <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="flex1">
-        <div v-if="checked == 0" class="overcicle">
-          <el-form
-            ref="loginForm"
-            :model="loginForm"
-            :rules="loginRules"
-            class="login-form"
-            auto-complete="on"
-            label-position="left"
-          >
-            <div class="title-container">
-              <p class="title">业务管理员注册</p>
-            </div>
-            <el-form-item prop="name">
-              <span class="svg-container"> 姓名 </span>
-              <el-input
-                ref="name"
-                v-model="loginForm.realName"
-                placeholder="输入业务员真实姓名"
-                name="name"
-                type="text"
-                tabindex="1"
-              />
-            </el-form-item>
-            <el-form-item prop="username">
-              <span class="svg-container"> 账户 </span>
-              <el-input
-                ref="username"
-                v-model="loginForm.account"
-                placeholder="输入账户名称"
-                name="username"
-                type="text"
-                tabindex="2"
-              />
-            </el-form-item>
-            <el-form-item prop="username">
-              <span class="svg-container"> 密码 </span>
-              <el-input
-                ref="password"
-                v-model="loginForm.password"
-                placeholder="至少6位数的字母数字组合"
-                name="password"
-                :type="passwordType"
-                tabindex="3"
-              />
-            </el-form-item>
-            <el-form-item prop="password">
-              <span class="svg-container"> 确认密码 </span>
-              <el-input
-                :key="passwordType"
-                ref="password"
-                v-model="loginForm.surepsd"
-                :type="passwordType"
-                placeholder="至少6位数的字母数字组合"
-                name="password"
-                tabindex="4"
-                auto-complete="on"
-                @keyup.enter.native="handleLogin"
-              />
-              <!-- <span class="show-pwd" @click="showPwd">
+	<div class="login-container">
+		<el-row>
+			<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="flex1">
+				<div v-if="checked == 0" class="overcicle">
+					<el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form"
+						auto-complete="on" label-position="left">
+						<div class="title-container">
+							<p class="title">业务管理员注册</p>
+						</div>
+						<el-form-item prop="name">
+							<span class="svg-container"> 姓名 </span>
+							<el-input ref="name" v-model="loginForm.realName" placeholder="输入业务员真实姓名" name="name"
+								type="text" tabindex="1" />
+						</el-form-item>
+						<el-form-item prop="username">
+							<span class="svg-container"> 账户 </span>
+							<el-input ref="username" v-model="loginForm.account" placeholder="输入账户名称" name="username"
+								type="text" tabindex="2" />
+						</el-form-item>
+						<el-form-item prop="username">
+							<span class="svg-container"> 密码 </span>
+							<el-input ref="password" v-model="loginForm.password" placeholder="至少6位数的字母数字组合"
+								name="password" :type="passwordType" tabindex="3" />
+						</el-form-item>
+						<el-form-item prop="password">
+							<span class="svg-container"> 确认密码 </span>
+							<el-input :key="passwordType" ref="password" v-model="loginForm.surepsd"
+								:type="passwordType" placeholder="至少6位数的字母数字组合" name="password" tabindex="4"
+								auto-complete="on" @keyup.enter.native="handleLogin" />
+							<!-- <span class="show-pwd" @click="showPwd">
                     <svg-icon :icon-class="passwordType === 'password' ? 'eye' : 'eye-open'" />
                   </span> -->
-            </el-form-item>
-            <el-form-item prop="mobile">
-              <span class="svg-container"> 联系电话 </span>
-              <el-input
-                ref="mobile"
-                v-model="loginForm.mobile"
-                type="text"
-                placeholder="请输入业务员联系电话"
-                name="mobile"
-                tabindex="5"
-                auto-complete="on"
-                @keyup.enter.native="handleLogin"
-              />
-            </el-form-item>
-
-            <el-button
-              :loading="loading"
-              type="primary"
-              class="loginbtn"
-              @click.native.prevent="handleLogin(loginForm)"
-            >注册账号
-            </el-button>
-            <div class="registerbtn flex3">
-              <div class="forgect">
-                <p class="asp">已有账号?</p>
-              </div>
-              <div class="forgect" @click="backLogin()">
-                <p class="nes">马上登录</p>
-              </div>
-            </div>
-          </el-form>
-        </div>
-        <div v-if="checked == 1 && showNext" class="overcicle">
-          <div class="title-container">
-            <p class="title">供货商注册</p>
-          </div>
-          <el-form
-            ref="providerForm"
-            :model="providerForm"
-            :rules="loginRules"
-            class="login-form"
-            auto-complete="on"
-            label-position="left"
-          >
-            <el-form-item prop="username">
-              <span class="svg-container"> 账户 </span>
-              <el-input
-                ref="username"
-                v-model="providerForm.username"
-                placeholder="输入账户名称"
-                name="username"
-                type="text"
-                tabindex="2"
-              />
-            </el-form-item>
-            <el-form-item prop="username">
-              <span class="svg-container"> 密码 </span>
-              <el-input
-                ref="password"
-                v-model="providerForm.password"
-                placeholder="至少6位数的字母数字组合"
-                name="password"
-                type="passwordType"
-                tabindex="3"
-              />
-            </el-form-item>
-            <el-form-item prop="password">
-              <span class="svg-container"> 确认密码 </span>
-              <el-input
-                :key="passwordType"
-                ref="password"
-                v-model="providerForm.surepsd"
-                :type="passwordType"
-                placeholder="至少6位数的字母数字组合"
-                name="password"
-                tabindex="4"
-                auto-complete="on"
-                @keyup.enter.native="handleLogin"
-              />
-              <!-- <span class="show-pwd" @click="showPwd">
+						</el-form-item>
+						<el-form-item prop="mobile">
+							<span class="svg-container"> 联系电话 </span>
+							<el-input ref="mobile" v-model="loginForm.mobile" type="text" placeholder="请输入业务员联系电话"
+								name="mobile" tabindex="5" auto-complete="on" @keyup.enter.native="handleLogin" />
+						</el-form-item>
+
+						<el-button :loading="loading" type="primary" class="loginbtn"
+							@click.native.prevent="handleLogin(loginForm)">注册账号
+						</el-button>
+						<div class="registerbtn flex3">
+							<div class="forgect">
+								<p class="asp">已有账号?</p>
+							</div>
+							<div class="forgect" @click="backLogin()">
+								<p class="nes">马上登录</p>
+							</div>
+						</div>
+					</el-form>
+				</div>
+				<div v-if="checked == 1 && showNext" class="overcicle">
+					<div class="title-container">
+						<p class="title">供货商注册</p>
+					</div>
+					<el-form ref="providerForm" :model="providerForm" :rules="loginRules" class="login-form"
+						auto-complete="on" label-position="left">
+						<el-form-item prop="username">
+							<span class="svg-container"> 账户 </span>
+							<el-input ref="username" v-model="providerForm.username" placeholder="输入账户名称"
+								name="username" type="text" tabindex="2" />
+						</el-form-item>
+						<el-form-item prop="username">
+							<span class="svg-container"> 密码 </span>
+							<el-input ref="password" v-model="providerForm.password" placeholder="至少6位数的字母数字组合"
+								name="password" type="passwordType" tabindex="3" />
+						</el-form-item>
+						<el-form-item prop="password">
+							<span class="svg-container"> 确认密码 </span>
+							<el-input :key="passwordType" ref="password" v-model="providerForm.surepsd"
+								:type="passwordType" placeholder="至少6位数的字母数字组合" name="password" tabindex="4"
+								auto-complete="on" @keyup.enter.native="handleLogin" />
+							<!-- <span class="show-pwd" @click="showPwd">
                     <svg-icon :icon-class="passwordType === 'password' ? 'eye' : 'eye-open'" />
                   </span> -->
-            </el-form-item>
-            <el-form-item prop="mobile">
-              <span class="svg-container"> 联系电话 </span>
-              <el-input
-                ref="mobile"
-                v-model="providerForm.mobile"
-                type="text"
-                placeholder="请输入业务员联系电话"
-                name="mobile"
-                tabindex="5"
-                auto-complete="on"
-                @keyup.enter.native="handleLogin"
-              />
-            </el-form-item>
-
-            <el-button
-              :loading="loading"
-              type="primary"
-              class="loginbtn"
-              @click.native.prevent="handleLogin"
-            >注册账号
-            </el-button>
-            <div class="registerbtn flex3">
-              <div class="forgect">
-                <p class="asp">已有账号?</p>
-              </div>
-              <div class="forgect" @click="backLogin()">
-                <p class="nes">马上登录</p>
-              </div>
-            </div>
-          </el-form>
-        </div>
-        <div
-          v-if="checked == 1 && !showNext"
-          style="margin-top: 670px"
-          class="overcicle"
-        >
-          <el-form
-            ref="providerForm"
-            :model="providerForm"
-            :rules="loginRules"
-            class="login-form"
-            auto-complete="on"
-            label-position="left"
-          >
-            <div class="title-container">
-              <p class="title">供货商注册</p>
-            </div>
-            <el-form-item prop="name">
-              <span class="svg-container"> 供货商 </span>
-              <el-input
-                ref="name"
-                v-model="providerForm.name"
-                placeholder="输入供货商名称"
-                name="name"
-                type="text"
-                tabindex="1"
-              />
-            </el-form-item>
-            <el-form-item prop="username">
-              <span class="svg-container"> 账户 </span>
-              <el-input
-                ref="username"
-                v-model="providerForm.account"
-                placeholder="输入账户名称"
-                name="username"
-                type="text"
-                tabindex="2"
-              />
-            </el-form-item>
-            <el-form-item prop="username">
-              <span class="svg-container"> 联系人 </span>
-              <el-input
-                ref="password"
-                v-model="providerForm.contacts"
-                placeholder="输入联系人的真实姓名"
-                name="password"
-                type="passwordType"
-                tabindex="3"
-              />
-            </el-form-item>
-            <el-form-item prop="username">
-              <span class="svg-container"> 统一社会信用代码 </span>
-              <el-input
-                ref="username"
-                v-model="providerForm.socialCode"
-                placeholder="输入统一社会信用代码"
-                name="username"
-                type="text"
-                tabindex="2"
-              />
-            </el-form-item>
-            <el-form-item prop="username">
-              <span class="svg-container"> 法人姓名 </span>
-              <el-input
-                ref="password"
-                v-model="providerForm.legalPerson"
-                placeholder="输入法人的真实姓名"
-                name="password"
-                type="passwordType"
-                tabindex="3"
-              />
-            </el-form-item>
-            <el-form-item prop="password">
-              <span class="svg-container"> 密码 </span>
-              <el-input
-                :key="passwordType"
-                ref="password"
-                v-model="providerForm.password"
-                :type="passwordType"
-                placeholder="至少6位数的字母数字组合"
-                name="password"
-                tabindex="4"
-                auto-complete="on"
-                @keyup.enter.native="handleLogin"
-              />
-              <!-- <span class="show-pwd" @click="showPwd">
+						</el-form-item>
+						<el-form-item prop="mobile">
+							<span class="svg-container"> 联系电话 </span>
+							<el-input ref="mobile" v-model="providerForm.mobile" type="text" placeholder="请输入业务员联系电话"
+								name="mobile" tabindex="5" auto-complete="on" @keyup.enter.native="handleLogin" />
+						</el-form-item>
+
+						<el-button :loading="loading" type="primary" class="loginbtn"
+							@click.native.prevent="handleLogin">注册账号
+						</el-button>
+						<div class="registerbtn flex3">
+							<div class="forgect">
+								<p class="asp">已有账号?</p>
+							</div>
+							<div class="forgect" @click="backLogin()">
+								<p class="nes">马上登录</p>
+							</div>
+						</div>
+					</el-form>
+				</div>
+				<div v-if="checked == 1 && !showNext" style="margin-top: 670px" class="overcicle">
+					<el-form ref="providerForm" :model="providerForm" :rules="loginRules" class="login-form"
+						auto-complete="on" label-position="left">
+						<div class="title-container">
+							<p class="title">供货商注册</p>
+						</div>
+						<el-form-item prop="name">
+							<span class="svg-container"> 供货商 </span>
+							<el-input ref="name" v-model="providerForm.name" placeholder="输入供货商名称" name="name"
+								type="text" tabindex="1" />
+						</el-form-item>
+						<el-form-item prop="username">
+							<span class="svg-container"> 账户 </span>
+							<el-input ref="username" v-model="providerForm.account" placeholder="输入账户名称" name="username"
+								type="text" tabindex="2" />
+						</el-form-item>
+						<el-form-item prop="username">
+							<span class="svg-container"> 联系人 </span>
+							<el-input ref="password" v-model="providerForm.contacts" placeholder="输入联系人的真实姓名"
+								name="password" type="passwordType" tabindex="3" />
+						</el-form-item>
+						<el-form-item prop="username">
+							<span class="svg-container"> 统一社会信用代码 </span>
+							<el-input ref="username" v-model="providerForm.socialCode" placeholder="输入统一社会信用代码"
+								name="username" type="text" tabindex="2" />
+						</el-form-item>
+						<el-form-item prop="username">
+							<span class="svg-container"> 法人姓名 </span>
+							<el-input ref="password" v-model="providerForm.legalPerson" placeholder="输入法人的真实姓名"
+								name="password" type="passwordType" tabindex="3" />
+						</el-form-item>
+						<el-form-item prop="password">
+							<span class="svg-container"> 密码 </span>
+							<el-input :key="passwordType" ref="password" v-model="providerForm.password"
+								:type="passwordType" placeholder="至少6位数的字母数字组合" name="password" tabindex="4"
+								auto-complete="on" @keyup.enter.native="handleLogin" />
+							<!-- <span class="show-pwd" @click="showPwd">
                     <svg-icon :icon-class="passwordType === 'password' ? 'eye' : 'eye-open'" />
                   </span> -->
-            </el-form-item>
-            <el-form-item prop="mobile" style="margin-bottom: 0">
-              <span class="svg-container"> 联系电话 </span>
-              <el-input
-                ref="mobile"
-                v-model="providerForm.contactsMobile"
-                type="text"
-                placeholder="请输入业务员联系电话"
-                name="mobile"
-                tabindex="5"
-              />
-            </el-form-item>
-            <div class="choosepic">
-              <el-form-item
-                style="background-color: transparent; margin: 0; padding: 0"
-              >
-                <span
-                  class="svg-container"
-                  style="
+						</el-form-item>
+						<el-form-item prop="mobile" style="margin-bottom: 0">
+							<span class="svg-container"> 联系电话 </span>
+							<el-input ref="mobile" v-model="providerForm.contactsMobile" type="text"
+								placeholder="请输入业务员联系电话" name="mobile" tabindex="5" />
+						</el-form-item>
+						<div class="choosepic">
+							<el-form-item style="background-color: transparent; margin: 0; padding: 0">
+								<span class="svg-container" style="
                     background-color: transparent;
                     margin: 0;
                     padding: 0;
                     margin-top: 5px;
-                  "
-                >
-                  认证照片
-                </span>
-                <div class="boximg">
-                  <el-upload
-                    class="upload-demo"
-                    drag
-                    :multiple="false"
-                    :show-file-list="false"
-                    action="https://ht.9026.com/api/File"
-                    :auto-upload="true"
-                    :on-success="handleAvatarSuccess"
-                    list-type="picture"
-                    style="margin-top: 15px"
-                  >
-                    <img v-if="imageUrl" :src="imageUrl" class="avatar">
-                    <el-image
-                      v-if="!imageUrl"
-                      style="width: 280px; height: 175px; margin-top: 5px"
-                      :src="upself"
-                      :fit="fit"
-                    />
-                  </el-upload>
-                </div>
-                <p class="usa">*注意上传法人手持身份证半身照</p>
-              </el-form-item>
-            </div>
-            <div class="choosepic">
-              <el-form-item
-                style="background-color: transparent; margin: 0; padding: 0"
-              >
-                <span
-                  class="svg-container"
-                  style="background-color: transparent; margin: 0; padding: 0"
-                >
-                  授权委托书
-                </span>
-                <div class="boximg">
-                  <el-upload
+                  ">
+									认证照片
+								</span>
+								<div class="boximg">
+									<el-upload action="https://ht.9026.com/api/File" list-type="picture-card"
+										:auto-upload="false" :on-change="handleAvatarSuccess"
+										:file-list="providerForm.identifyPics">
+										<i slot="default" class="el-icon-plus" />
+										<div slot="file" slot-scope="{ file }">
+											<img class="el-upload-list__item-thumbnail" :src="file.url" alt="">
+
+										</div>
+									</el-upload>
+									<el-dialog :visible.sync="dialogVisible">
+										<img width="" :src="providerForm.identifyPics" alt="">
+									</el-dialog>
+								</div>
+								<p class="usa">*注意上传法人手持身份证半身照</p>
+							</el-form-item>
+						</div>
+						<div class="choosepic">
+							<el-form-item style="background-color: transparent; margin: 0; padding: 0">
+								<span class="svg-container"
+									style="background-color: transparent; margin: 0; padding: 0">
+									授权委托书
+								</span>
+								<div class="boximg">
+									<!-- <el-upload
                     class="upload-demo"
                     drag
                     :multiple="false"
@@ -335,6 +183,7 @@
                     :auto-upload="true"
                     :on-success="handleSuccess"
                     list-type="picture"
+					:file-list="providerForm.proxyFile"
                     style="margin-top: 15px"
                   >
                     <img v-if="imageUrl" :src="imageUrl" class="avatar">
@@ -344,476 +193,465 @@
                       :src="upweituo"
                       :fit="fit"
                     />
-                  </el-upload>
-                  <!-- <el-upload
-                    action="http://123.207.180.167:8700/api/File"
-                    list-type="picture-card"
-                    :on-preview="handlePictureCardPreview"
-                    :on-remove="handleRemove"
-                  >
-                    <i class="el-icon-plus"></i>
-                  </el-upload>
-                  <el-dialog :visible.sync="dialogVisible">
-                    <img width="100%" :src="dialogImageUrl" alt="" />
-                  </el-dialog> -->
-                </div>
-                <p class="usa">*注意上传法人签署的授权委托书</p>
-              </el-form-item>
-            </div>
-            <!-- <el-button :loading="loading" type="primary" class="loginbtn" @click.native.prevent="nextStep">下一步
+                  </el-upload> -->
+									<el-upload action="https://ht.9026.com/api/File" list-type="picture-card"
+										:auto-upload="false" :on-change="handleSuccess"
+										:file-list="providerForm.proxyFile">
+										<i slot="default" class="el-icon-plus" />
+										<div slot="file" slot-scope="{ file }">
+											<img class="el-upload-list__item-thumbnail" :src="file.url" alt="">
+
+										</div>
+									</el-upload>
+									<el-dialog :visible.sync="dialogVisible">
+										<img width="" :src="providerForm.proxyFile" alt="">
+									</el-dialog>
+								</div>
+								<p class="usa">*注意上传法人签署的授权委托书</p>
+							</el-form-item>
+						</div>
+						<!-- <el-button :loading="loading" type="primary" class="loginbtn" @click.native.prevent="nextStep">下一步
             </el-button> -->
-            <el-button
-              :loading="loading"
-              type="primary"
-              class="loginbtn"
-              @click.native.prevent="handleLogin(providerForm)"
-            >注册账号
-            </el-button>
-            <div class="registerbtn flex3">
-              <div class="forgect">
-                <p class="asp">已有账号?</p>
-              </div>
-              <div class="forgect" @click="backLogin()">
-                <p class="nes">马上登录</p>
-              </div>
-            </div>
-          </el-form>
-        </div>
-      </el-col>
-    </el-row>
-  </div>
+						<el-button :loading="loading" type="primary" class="loginbtn"
+							@click.native.prevent="handleLogin(providerForm)">注册账号
+						</el-button>
+						<div class="registerbtn flex3">
+							<div class="forgect">
+								<p class="asp">已有账号?</p>
+							</div>
+							<div class="forgect" @click="backLogin()">
+								<p class="nes">马上登录</p>
+							</div>
+						</div>
+					</el-form>
+				</div>
+			</el-col>
+		</el-row>
+	</div>
 </template>
 
 <script>
-let that
-import { validUsername } from '@/utils/validate'
-import logo from '/src/assets/img/logo.png'
-import upself from '/src/assets/img/upuer.png'
-import upweituo from '/src/assets/img/upattor.png'
-import request from '@/utils/request'
-export default {
-  name: 'Login',
-  data() {
-    const validatename = (rule, value, callback) => {
-      if (value.length == 0) {
-        callback(new Error('请输入业务员真实姓名'))
-      } else {
-        callback()
-      }
-    }
-    const validateUsername = (rule, value, callback) => {
-      if (!validUsername(value)) {
-        callback(new Error('请输入账户名称'))
-      } else {
-        callback()
-      }
-    }
-
-    const validatePassword = (rule, value, callback) => {
-      if (value.length < 6) {
-        callback(new Error('请输入大于6位数密码'))
-      } else {
-        callback()
-      }
-    }
-    const validatemobile = (rule, value, callback) => {
-      if (value.length == 0) {
-        callback(new Error('请输入电话号码'))
-      } else {
-        callback()
-      }
-    }
-    return {
-      upself: upself,
-      upweituo: upweituo,
-      fit: 'cover',
-      imageUrl: '',
-      loginForm: {
-        realName: '',
-        account: '',
-        password: '',
-        surepsd: '',
-        mobile: ''
-      },
-      providerForm: {
-        account: '',
-        password: '',
-        name: '',
-        socialCode: '',
-        legalPerson: '',
-        contacts: '',
-        contactsMobile: '',
-        identifyPics: [
-          'https://easygolf.oss-ap-southeast-6.aliyuncs.com/golf/2022-03/18/88df7532ff7de229b617.jpg',
-          'https://easygolf.oss-ap-southeast-6.aliyuncs.com/golf/2022-03/18/ab37cbd176e12cef2f82.jpg'
-        ],
-        proxyFile: [
-          'https://easygolf.oss-ap-southeast-6.aliyuncs.com/golf/2022-03/18/88df7532ff7de229b617.jpg',
-          'https://easygolf.oss-ap-southeast-6.aliyuncs.com/golf/2022-03/18/ab37cbd176e12cef2f82.jpg'
-        ]
-      },
-      loginRules: {
-        realName: [
-          {
-            required: true,
-            trigger: 'blur',
-            validator: validatename
-          }
-        ],
-        account: [
-          {
-            required: true,
-            trigger: 'blur',
-            validator: validateUsername
-          }
-        ],
-        password: [
-          {
-            required: true,
-            trigger: 'blur',
-            validator: validatePassword
-          }
-        ],
-        mobile: [
-          {
-            required: true,
-            trigger: 'blur',
-            validator: validatemobile
-          }
-        ]
-      },
-      loading: false,
-      passwordType: 'password',
-      redirect: undefined,
-      src: logo,
-      checked: 0,
-      showNext: false
-    }
-  },
-  watch: {
-    $route: {
-      handler: function(route) {
-        this.redirect = route.query && route.query.redirect
-      },
-      immediate: true
-    }
-  },
-  mounted() {
-    that = this
-    this.checked = this.$route.query.checked
-  },
-  methods: {
-    nextStep() {
-      this.showNext = true
-    },
-    handleAvatarSuccess(res, file) {
-      console.log(file.raw, 88)
-      this.upself = URL.createObjectURL(file.raw)
-    },
-    handleSuccess(res, file) {
-	  console.log(file.raw, 88)
-	  this.upweituo = URL.createObjectURL(file.raw)
-    },
-    handlePictureCardPreview(file) {
-      console.log(file, 88)
-      this.imageUrl = file.url
-    },
-    showPwd() {
-      if (this.passwordType === 'password') {
-        this.passwordType = ''
-      } else {
-        this.passwordType = 'password'
-      }
-      this.$nextTick(() => {
-        this.$refs.password.focus()
-      })
-    },
-    backLogin() {
-      this.$router.replace({
-        path: '/login',
-        query: {}
-      })
-    },
-    handleLogin(form) {
-      if (form == this.loginForm) {
-        request({
-          url: '/api/Account/register',
-          method: 'post',
-          data: form
-        }).then((res) => {
-          this.$message('注册成功')
-          this.$router.push({ path: '/login' })
-        })
-      } else {
-        this.$request({
-          url: '/api/Supplier/register',
-          method: 'post',
-          data: form
-        }).then((res) => {
-          this.$message('注册成功')
-          this.$router.push({
-            path: '/login',
-            query: { checked: this.checked }
-          })
-        })
-      }
-    }
-  }
-}
+	let that
+	import {
+		validUsername
+	} from '@/utils/validate'
+	import logo from '/src/assets/img/logo.png'
+	import upself from '/src/assets/img/upuer.png'
+	import upweituo from '/src/assets/img/upattor.png'
+	import request from '@/utils/request'
+	export default {
+		name: 'Login',
+		data() {
+			const validatename = (rule, value, callback) => {
+				if (value.length == 0) {
+					callback(new Error('请输入业务员真实姓名'))
+				} else {
+					callback()
+				}
+			}
+			const validateUsername = (rule, value, callback) => {
+				if (!validUsername(value)) {
+					callback(new Error('请输入账户名称'))
+				} else {
+					callback()
+				}
+			}
+
+			const validatePassword = (rule, value, callback) => {
+				if (value.length < 6) {
+					callback(new Error('请输入大于6位数密码'))
+				} else {
+					callback()
+				}
+			}
+			const validatemobile = (rule, value, callback) => {
+				if (value.length == 0) {
+					callback(new Error('请输入电话号码'))
+				} else {
+					callback()
+				}
+			}
+			return {
+				dialogVisible: false,
+				disabled: false,
+				upself: upself,
+				upweituo: upweituo,
+				fit: 'cover',
+				imageUrl: '',
+				loginForm: {
+					realName: '',
+					account: '',
+					password: '',
+					surepsd: '',
+					mobile: ''
+				},
+				providerForm: {
+					account: '',
+					password: '',
+					name: '',
+					socialCode: '',
+					legalPerson: '',
+					contacts: '',
+					contactsMobile: '',
+					identifyPics: [],
+					proxyFile: [],
+				},
+				loginRules: {
+					realName: [{
+						required: true,
+						trigger: 'blur',
+						validator: validatename
+					}],
+					account: [{
+						required: true,
+						trigger: 'blur',
+						validator: validateUsername
+					}],
+					password: [{
+						required: true,
+						trigger: 'blur',
+						validator: validatePassword
+					}],
+					mobile: [{
+						required: true,
+						trigger: 'blur',
+						validator: validatemobile
+					}]
+				},
+				loading: false,
+				passwordType: 'password',
+				redirect: undefined,
+				src: logo,
+				checked: 0,
+				showNext: false
+			}
+		},
+		watch: {
+			$route: {
+				handler: function(route) {
+					this.redirect = route.query && route.query.redirect
+				},
+				immediate: true
+			}
+		},
+		mounted() {
+			that = this
+			this.checked = this.$route.query.checked
+		},
+		methods: {
+			nextStep() {
+				this.showNext = true
+			},
+			handleAvatarSuccess(file, fileList) {
+				console.log(file,"identifyPics")
+				this.providerForm.identifyPics = fileList
+				console.log(this.providerForm.identifyPics)
+			},
+			handleSuccess(file, fileList) {
+				this.providerForm.proxyFile = fileList
+				console.log(this.providerForm.proxyFile)
+			},
+			handlePictureCardPreview(file) {
+				console.log(file, 88)
+				this.imageUrl = file.url
+			},
+			showPwd() {
+				if (this.passwordType === 'password') {
+					this.passwordType = ''
+				} else {
+					this.passwordType = 'password'
+				}
+				this.$nextTick(() => {
+					this.$refs.password.focus()
+				})
+			},
+			backLogin() {
+				this.$router.replace({
+					path: '/login',
+					query: {}
+				})
+			},
+			handleLogin(form) {
+				if (form == this.loginForm) {
+					request({
+						url: '/api/Account/register',
+						method: 'post',
+						data: form
+					}).then((res) => {
+						this.$message('注册成功')
+						this.$router.push({
+							path: '/login'
+						})
+					})
+				} else {
+					this.$request({
+						url: '/api/Supplier/register',
+						method: 'post',
+						data: form
+					}).then((res) => {
+						this.$message('注册成功')
+						this.$router.push({
+							path: '/login',
+							query: {
+								checked: this.checked
+							}
+						})
+					})
+				}
+			}
+		}
+	}
 </script>
 
 <style lang="scss">
-
-$bg: #f6f6f6;
-$light_gray: #bebdbb;
-$cursor: #bebdbb;
-
-@supports (-webkit-mask: none) and (not (cater-color: $cursor)) {
-  .login-container .el-input input {
-    color: $cursor;
-  }
-}
-
-/* reset element-ui css */
-.login-container {
-  overflow: auto;
-  background: url("../../assets/img/registerbg.png") no-repeat;
-  background-size: 100%;
-
-  .el-input {
-    display: inline-block;
-    height: 47px;
-    width: 70%;
-    background-color: #f6f6f6;
-
-    input {
-      background: #f6f6f6;
-      border: 0px;
-      -webkit-appearance: none;
-      border-radius: 0px;
-      padding: 12px 5px 12px 15px;
-      color: $light_gray;
-      height: 47px;
-      caret-color: $cursor;
-
-      &:-webkit-autofill {
-        box-shadow: 0 0 0px 1000px $bg inset !important;
-        -webkit-text-fill-color: $cursor !important;
-      }
-    }
-  }
-
-  .el-form-item {
-    border: 1px solid rgba(255, 255, 255, 0.1);
-    background: #f6f6f6;
-    border-radius: 5px;
-    color: #454545;
-  }
-}
+	$bg: #f6f6f6;
+	$light_gray: #bebdbb;
+	$cursor: #bebdbb;
+
+	@supports (-webkit-mask: none) and (not (cater-color: $cursor)) {
+		.login-container .el-input input {
+			color: $cursor;
+		}
+	}
+
+	/* reset element-ui css */
+	.login-container {
+		overflow: auto;
+		background: url("../../assets/img/registerbg.png") no-repeat;
+		background-size: 100%;
+
+		.el-input {
+			display: inline-block;
+			height: 47px;
+			width: 70%;
+			background-color: #f6f6f6;
+
+			input {
+				background: #f6f6f6;
+				border: 0px;
+				-webkit-appearance: none;
+				border-radius: 0px;
+				padding: 12px 5px 12px 15px;
+				color: $light_gray;
+				height: 47px;
+				caret-color: $cursor;
+
+				&:-webkit-autofill {
+					box-shadow: 0 0 0px 1000px $bg inset !important;
+					-webkit-text-fill-color: $cursor !important;
+				}
+			}
+		}
+
+		.el-form-item {
+			border: 1px solid rgba(255, 255, 255, 0.1);
+			background: #f6f6f6;
+			border-radius: 5px;
+			color: #454545;
+		}
+	}
 </style>
 
 <style lang="scss" scoped>
-$bg: #2d3a4b;
-$dark_gray: #f6f6f6;
-$light_gray: #eee;
-
-.login-container {
-  height: 100%;
-  width: 100%;
-  // background-color: $bg;
-  // overflow: hidden;
-
-  .login-form {
-    position: relative;
-    width: 470px;
-    max-width: 100%;
-    padding: 0 35px 0;
-    margin: 0 auto;
-    // overflow: hidden;
-  }
-
-  .tips {
-    font-size: 14px;
-    color: #fff;
-    margin-bottom: 10px;
-
-    span {
-      &:first-of-type {
-        margin-right: 16px;
-      }
-    }
-  }
-
-  .svg-container {
-    padding: 6px 5px 6px 15px;
-    color: #1f242a;
-    vertical-align: middle;
-    // width: 30px;
-    display: inline-block;
-  }
-
-  .title-container {
-    position: relative;
-
-    .title {
-      font-size: 48px;
-      color: #1f242a;
-      margin: 0px auto 40px auto;
-      text-align: center;
-      font-weight: bold;
-    }
-  }
-
-  .show-pwd {
-    position: absolute;
-    right: 10px;
-    top: 7px;
-    font-size: 16px;
-    color: $dark_gray;
-    cursor: pointer;
-    user-select: none;
-  }
-}
-
-.el-row {
-  height: 100%;
-}
-
-.el-col {
-  height: 100%;
-}
-
-.business {
-  width: 305px;
-  height: 90px;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  text-align: center;
-  // background-color: #D8AB5A;
-  border-raotherdius: 20rpx;
-  color: #ffffff;
-  margin-top: 57rpx;
-}
-
-.business {
-  width: 305rpx;
-  height: 90rpx;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  text-align: center;
-  // background-color: #D8AB5A;
-  border-raotherdius: 20rpx;
-  color: #ffffff;
-  margin-top: 57rpx;
-  // line-height: 110rpx;
-}
-
-.bnesper {
-  background-size: 100%;
-  background-image: url("../../assets/img/loginbtn4.png");
-  background-repeat: no-repeat;
-  padding-top: 10rpx;
-  color: #fff1d8;
-
-  .asp {
-    padding-bottom: 5px;
-  }
-}
-
-.applyper {
-  background-image: url("../../assets/img/loginbt1.png");
-  background-repeat: no-repeat;
-  background-size: 100%;
-  padding-top: 10rpx;
-  color: #fff1d8;
-
-  .asp {
-    padding-bottom: 5px;
-  }
-}
-
-.actapp {
-  background-image: url("../../assets/img/loginbtn3.png");
-  background-repeat: no-repeat;
-  background-size: 100%;
-  color: #d05c39;
-  margin-bottom: 80rpx;
-
-  .as {
-    padding-bottom: 20px;
-  }
-
-  // line-height: 180rpx;
-}
-
-.actbnes {
-  background-image: url("../../assets/img/loginbt2.png");
-  background-repeat: no-repeat;
-  background-size: 100%;
-  color: #d05c39;
-
-  .asp {
-    padding-bottom: 20px;
-  }
-}
-
-.loginbtn {
-  width: 100%;
-  margin-top: 30px;
-  background: linear-gradient(to right, #ffe1ad, #d07539);
-  border: none;
-  height: 56px;
-  border-radius: 10px;
-  font-size: 18px;
-}
-
-.registerbtn {
-  margin-top: 0px;
-  margin-bottom: 30px;
-  font-size: 16px;
-
-  .forgect {
-    cursor: pointer;
-  }
-
-  .nes {
-    color: #d05c39;
-  }
-}
-
-.boximg {
-  width: 100%;
-  height: 240px;
-  border-radius: 10px;
-  background-color: #f6f6f6;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-
-  image {
-    width: 290px;
-    height: 150px;
-  }
-}
-
-.choosepic {
-  .el-form-item__content {
-  }
-}
-
-.usa {
-  color: #d05c39;
-  text-align: center;
-  padding: 0 !important;
-  margin: 0;
-}
-
-.overcicle {
-  border: 1px solid #ffe2ae;
-  padding-top: 50px;
-  box-sizing: border-box;
-}
-
+	$bg: #2d3a4b;
+	$dark_gray: #f6f6f6;
+	$light_gray: #eee;
+
+	.login-container {
+		height: 100%;
+		width: 100%;
+		// background-color: $bg;
+		// overflow: hidden;
+
+		.login-form {
+			position: relative;
+			width: 470px;
+			max-width: 100%;
+			padding: 0 35px 0;
+			margin: 0 auto;
+			// overflow: hidden;
+		}
+
+		.tips {
+			font-size: 14px;
+			color: #fff;
+			margin-bottom: 10px;
+
+			span {
+				&:first-of-type {
+					margin-right: 16px;
+				}
+			}
+		}
+
+		.svg-container {
+			padding: 6px 5px 6px 15px;
+			color: #1f242a;
+			vertical-align: middle;
+			// width: 30px;
+			display: inline-block;
+		}
+
+		.title-container {
+			position: relative;
+
+			.title {
+				font-size: 48px;
+				color: #1f242a;
+				margin: 0px auto 40px auto;
+				text-align: center;
+				font-weight: bold;
+			}
+		}
+
+		.show-pwd {
+			position: absolute;
+			right: 10px;
+			top: 7px;
+			font-size: 16px;
+			color: $dark_gray;
+			cursor: pointer;
+			user-select: none;
+		}
+	}
+
+	.el-row {
+		height: 100%;
+	}
+
+	.el-col {
+		height: 100%;
+	}
+
+	.business {
+		width: 305px;
+		height: 90px;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		text-align: center;
+		// background-color: #D8AB5A;
+		border-raotherdius: 20rpx;
+		color: #ffffff;
+		margin-top: 57rpx;
+	}
+
+	.business {
+		width: 305rpx;
+		height: 90rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		text-align: center;
+		// background-color: #D8AB5A;
+		border-raotherdius: 20rpx;
+		color: #ffffff;
+		margin-top: 57rpx;
+		// line-height: 110rpx;
+	}
+
+	.bnesper {
+		background-size: 100%;
+		background-image: url("../../assets/img/loginbtn4.png");
+		background-repeat: no-repeat;
+		padding-top: 10rpx;
+		color: #fff1d8;
+
+		.asp {
+			padding-bottom: 5px;
+		}
+	}
+
+	.applyper {
+		background-image: url("../../assets/img/loginbt1.png");
+		background-repeat: no-repeat;
+		background-size: 100%;
+		padding-top: 10rpx;
+		color: #fff1d8;
+
+		.asp {
+			padding-bottom: 5px;
+		}
+	}
+
+	.actapp {
+		background-image: url("../../assets/img/loginbtn3.png");
+		background-repeat: no-repeat;
+		background-size: 100%;
+		color: #d05c39;
+		margin-bottom: 80rpx;
+
+		.as {
+			padding-bottom: 20px;
+		}
+
+		// line-height: 180rpx;
+	}
+
+	.actbnes {
+		background-image: url("../../assets/img/loginbt2.png");
+		background-repeat: no-repeat;
+		background-size: 100%;
+		color: #d05c39;
+
+		.asp {
+			padding-bottom: 20px;
+		}
+	}
+
+	.loginbtn {
+		width: 100%;
+		margin-top: 30px;
+		background: linear-gradient(to right, #ffe1ad, #d07539);
+		border: none;
+		height: 56px;
+		border-radius: 10px;
+		font-size: 18px;
+	}
+
+	.registerbtn {
+		margin-top: 0px;
+		margin-bottom: 30px;
+		font-size: 16px;
+
+		.forgect {
+			cursor: pointer;
+		}
+
+		.nes {
+			color: #d05c39;
+		}
+	}
+
+	.boximg {
+		width: 100%;
+		height: 240px;
+		border-radius: 10px;
+		background-color: #f6f6f6;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+
+		image {
+			width: 290px;
+			height: 150px;
+		}
+	}
+
+	.choosepic {
+		.el-form-item__content {}
+	}
+
+	.usa {
+		color: #d05c39;
+		text-align: center;
+		padding: 0 !important;
+		margin: 0;
+	}
+
+	.overcicle {
+		border: 1px solid #ffe2ae;
+		padding-top: 50px;
+		box-sizing: border-box;
+	}
 </style>

+ 39 - 32
src/views/table/index.vue

xqd xqd xqd xqd xqd xqd
@@ -72,10 +72,10 @@
 				<template slot-scope="scope">
 					<el-tag type="primary" style="cursor: pointer;margin-right: 15px;" @click="toDetail(scope.row.id)">
 						详情</el-tag>
-					<el-tag type="success" style="cursor: pointer;margin-right: 15px;" @click="recover(scope.row.id)">恢复
+					<el-tag type="success" style="cursor: pointer;margin-right: 15px;" @click="recover(scope.row.id)" v-if="scope.row.status==1">恢复
 					</el-tag>
 					<el-tag type="danger" style="cursor: pointer;margin-right: 15px;"
-						@click="deleteStatus(scope.row.id)">删除</el-tag>
+						@click="deleteStatus(scope.row.id)" v-if="scope.row.status==0">删除</el-tag>
 
 				</template>
 			</el-table-column>
@@ -159,20 +159,23 @@
 		},
 		created() {},
 		mounted() {
-			this.$request({
-				url: '/api/Acceptor/search',
-				method: 'post',
-				data: {
-					pageIndex: 1,
-					pageSize: 100,
-				}
-			}).then((res) => {
-				console.log(res.data.result);
-				this.list = res.data.result;
-				this.getPageData();
-			})
+			this.getAllList()
 		},
 		methods: {
+			getAllList(){
+				this.$request({
+					url: '/api/Acceptor/search',
+					method: 'post',
+					data: {
+						pageIndex: 1,
+						pageSize: 100,
+					}
+				}).then((res) => {
+					console.log(res.data.result);
+					this.list = res.data.result;
+					this.getPageData();
+				})
+			},
 			handleCommand(command) {
 				this.status = command
 				if (this.status == "正常" || this.status == "删除") {
@@ -201,13 +204,6 @@
 				}
 			},
 			addAcceptor() {
-				// let confirm = window.confirm("你确定新增承兑人")
-				// if (confirm) {
-				// 	this.$router.push({
-				// 		path: '/table/addAcceptor'
-				// 	})
-				// } else {
-				// }
 				this.$router.push({
 						path: '/table/addAcceptor'
 					})
@@ -234,11 +230,13 @@
 							type:'success',
 							message:'恢复成功'
 						})
+						this.getAllList()
 					}else{
 						this.$message({
 							type:'danger',
 							message:'恢复失败'
 						})
+						this.getAllList()
 					}
 				})
 			},
@@ -256,11 +254,13 @@
 							type:'success',
 							message:'删除成功'
 						})
+						this.getAllList()
 					}else{
 						this.$message({
 							type:'danger',
 							message:'删除失败'
 						})
+						this.getAllList()
 					}
 				})
 			},
@@ -285,17 +285,24 @@
 				this.temporaryList = this.srcList
 			},
 			Exports() {
-				var tableHeader = [
-					['序号','承兑人名称', '账号', '开户行名称', '服务费率(%)', '利率(%)', '状态', '时间'],
-				]
-				var dataList = []
-				this.multipleSelection.forEach((item, index) => {
-					dataList.push([index + 1, item.name, item.bankAccount, item.bankName, item.serviceRate, item
-						.interest, item.statusText, item.createdAt
-					]);
-				})
-				dataConversionUtil.dataToExcel('承兑人列表', tableHeader, dataList)
-				this.$message.success('导出成功!');
+				if(this.multipleSelection==""){
+					this.$message({
+						type:'warning',
+						message:'请选择数据!'
+					})
+				}else{
+					var tableHeader = [
+						['序号','承兑人名称', '账号', '开户行名称', '服务费率(%)', '利率(%)', '状态', '时间'],
+					]
+					var dataList = []
+					this.multipleSelection.forEach((item, index) => {
+						dataList.push([index + 1, item.name, item.bankAccount, item.bankName, item.serviceRate, item
+							.interest, item.statusText, item.createdAt
+						]);
+					})
+					dataConversionUtil.dataToExcel('承兑人列表', tableHeader, dataList)
+					this.$message.success('导出成功!');
+				}	
 			}
 		},
 	}