ソースを参照

前端 客户管理 sdy

zhongtianhaoyuan 3 年 前
コミット
5a2b526ef5

+ 4 - 113
src/api/V2/houseSelfCollect/index.js

@@ -1,113 +1,4 @@
-/**
- * @fileOverview 证书
- * @author Yolo
- */
-// 动态请求前缀
-const baseUrl = process.env.VUE_APP_API_CERTIFICATE
-
-// 证书一览列表 {companyId:}     老接口:getCrtListByCondition
-export const API_GET_CRTLISTBYCONDITION = `${baseUrl}/certificate/query/getCrtListByCondition`
-
-// 获取证书概况{companyId:}     老接口:getCrtNumByCompId
-export const API_GET_CRTNUMBYCOMPID = `${baseUrl}/certificate/query/getCrtNumByCompId`
-
-// 获取证书详情 {id:}     老接口:getCrtByPk
-export const API_GET_CRTBYPK = `${baseUrl}/certificate/query/getCrtByPk`
-
-// 删除证书     老接口:deleteCrt
-export const API_POST_DELETECRT = `${baseUrl}/certificate/api/deleteCrt`
-
-// 查询基础数据     老接口:getListByCondition
-export const API_GET_LISTBYCONDITION = `${baseUrl}/certificateParameter/query/getListByCondition`
-
-// 查询币种     老接口:parameterTenant
-export const API_GET_PARAMETERTENANT = '/parameterCompany/query/parameterTenant'
-
-// 查询换证历史     老接口:getCrtChangeHistorys
-export const API_GET_CRTCHANGEHISTORYS = `${baseUrl}/certificate/query/getCrtChangeHistorys`
-
-// 所属船舶     老接口:getUserVesselListByStatus
-export const API_GET_USERVESSELLISTBYSTATUS = '/vessel/query/getUserVesselListByStatus'
-
-// 新增证书     老接口:addCrt
-export const API_POST_ADDCRT = `${baseUrl}/certificate/api/addCrt`
-
-// 换证     老接口:changeCrt
-export const API_POST_CHANGECRT = `${baseUrl}/certificate/api/changeCrt`
-
-// 更新证书     老接口:updateCrt
-export const API_POST_UPDATECRT = `${baseUrl}/certificate/api/updateCrt`
-
-// 保存证书检验信息     老接口:saveCrtSurvey
-export const API_POST_SAVECRTSURVEY = `${baseUrl}/certificateSurvey/api/saveCrtSurvey`
-
-// 根据id查询检验信息     老接口:getSurveyByPk
-export const API_GET_SURVEYBYPK = `${baseUrl}/certificateSurvey/query/getSurveyByPk`
-
-// 获取证书检验信息列表     老接口:getCrtSurveyListByCondition
-export const API_GET_CRTSURVEYLISTBYCONDITION = `${baseUrl}/certificateSurvey/query/getCrtSurveyListByCondition`
-
-// 删除证书检验信息     老接口:deleteCrtSurvey
-export const API_POST_DELETECRTSURVEY = `${baseUrl}/certificateSurvey/api/deleteCrtSurvey`
-
-// 新增或修改基础数据     老接口:save1
-export const API_POST_SAVE = `${baseUrl}/certificateParameter/api/save`
-// 删除基础数据     老接口:deleteMsg
-export const API_POST_DELETE = `${baseUrl}/certificateParameter/api/delete`
-
-// 基础数据排序     老接口:order
-export const API_POST_ORDER = `${baseUrl}/certificateParameter/api/order`
-// 上传附件     老接口:uploadFiles
-export const API_POST_UPLOADFILES = '/appendix/api/uploadFiles'
-// 责任部门基础数据     老接口:deptListByCompId
-export const API_GET_DEPTLISTBYCOMPID = '/staff/query/deptListByCompId'
-
-// 导入文件     老接口:importCertificate
-export const API_POST_IMPORTMULTIPARTFILE = `${baseUrl}/certificate/api/importMultipartFile`
-
-// 导入文件附件     老接口:importCertificateFiles
-export const API_POST_IMPORTCERTIFICATEFILES = '/appendix/api/importCertificateFiles'
-
-// 校验当前导入的文件是否有关联数据     老接口:checkoutImportCertificateFiles
-export const API_GET_CHECKOUTIMPORTCERTIFICATEFILES = '/appendix/api/checkoutImportCertificateFiles'
-
-// 导入文件     老接口:importRepeatCertificate
-export const API_POST_IMPORTREPEATCERTIFICATE = `${baseUrl}/certificate/api/importRepeatCertificate`
-
-// 证书模板一览     老接口:getCrtTempList
-export const API_GET_CRTTEMPLIST = `${baseUrl}/certificateTempInfo/query/getCrtTempList`
-
-// 查询所有类型模板数据     老接口:getCrtTypeTempList
-export const API_GET_CRTTYPETEMPLIST = `${baseUrl}/certificateTempInfo/query/getCrtTypeTempList`
-
-//新增 证书模板     老接口:saveCrtTemp
-export const API_POST_SAVECRTTEMP = `${baseUrl}/certificateTempInfo/api/saveCrtTemp`
-
-//编辑 证书模板     老接口:editCrtTemp
-export const API_POST_EDITCRTTEMP = `${baseUrl}/certificateTempInfo/api/editCrtTemp`
-
-//删除 证书模板     老接口:removeCrtTemp
-export const API_POST_REMOVECRTTEMP = `${baseUrl}/certificateTempInfo/api/removeCrtTemp`
-
-//删除 证书模板     老接口:removeCrtTempId
-export const API_POST_REMOVECRTTEMPID = `${baseUrl}/certificateTempInfo/api/removeCrtTempId`
-
-//证书模板排序     老接口:changeOrder
-export const API_POST_CERTIFICATETEMPINFO_ORDER = `${baseUrl}/certificateTempInfo/api/order`
-
-//保存模板证书     老接口:saveCrtTypeTempList
-export const API_POST_SAVECRTTYPETEMPLIST = `${baseUrl}/certificateTempInfo/api/saveCrtTypeTempList`
-
-// 查询附件地址
-export const API_GET_CERTIFICATE_SEARCHPLACE = `${baseUrl}/certificate/api/searchPlace`
-
-//选项卡数值
-export const API_GET_CERTIFICATE_GETCRTNUMBYCONDITION = `${baseUrl}/certificate/query/getCrtNumByCondition`
-
-// 证书管理=> 一览接口以及顶部的状态
-export const API_GET_CERTIFICATE_GETCRTLISTBYCONDITIONDATA = `${baseUrl}/certificate/query/getCrtListByConditionData`
-
-
-
-// 证书模块
-export const API_GET_SP_GETCRTLIST = `${baseUrl}/certificate/query/getCrtListByCondition`
+//客户管理列表
+export const API_GET_CUSTOMER_MANAGE = '/identityAuthenticationInfo/selectIdentityAuthenticationInfoPurchase'
+//新增粮商
+export const API_GET_CUSTOMER_ADD = '/identityAuthenticationInfo/api/addIdentityAuthenticationInfo'

+ 7 - 3
src/model/houseSelfCollect/index.js

@@ -2,9 +2,13 @@ import { errorCatcher, errorHandle, filter } from 'base-core-lib'
 import { appRx } from '../defalutConfig/indexRx'
 
 import {
-  API_GET_CRTNUMBYCOMPID
-} from '@/api/V2/houseSelfCollect'
+  API_GET_CUSTOMER_MANAGE,
+  API_GET_CUSTOMER_ADD
 
-export const getCrtNumByCompId = appRx.get(API_GET_CRTNUMBYCOMPID, errorCatcher, errorHandle, filter)
+} from '@/api/V2/houseSelfCollect'
+//客户管理列表
+export const getCustomerManage = appRx.get(API_GET_CUSTOMER_MANAGE, errorCatcher, errorHandle, filter)
+//新增粮商
+export const customerAdd = appRx.post(API_GET_CUSTOMER_ADD, errorCatcher, errorHandle, filter)
 
 

+ 24 - 23
src/views/houseSelfCollect/customerManagement.vue

@@ -80,7 +80,7 @@
     </div>
 
     <el-table
-      :data="customertList.records"
+      :data="customertList"
       style="width: 100%; margin-top: 20px"
       ref="warehouseList"
       border
@@ -92,15 +92,15 @@
           <span v-else>{{ scope.$index + 1 }}</span>
         </template>
       </el-table-column>
-      <el-table-column prop="contractNo" label="客户"></el-table-column>
-      <el-table-column prop="goodsName" label="手机号"></el-table-column>
-      <el-table-column prop="weight" label="银行卡号"></el-table-column>
+      <el-table-column prop="customerName" label="客户"></el-table-column>
+      <el-table-column prop="customerPhone" label="手机号"></el-table-column>
+      <el-table-column prop="bankCard" label="银行卡号"></el-table-column>
       <el-table-column
-        prop="unitContractPrice"
+        prop="bankDeposit"
         label="开户行"
       ></el-table-column>
-      <el-table-column prop="packingMethod" label="收款人"></el-table-column>
-      <el-table-column prop="status" label="状态"></el-table-column>
+      <el-table-column prop="payeeName" label="收款人"></el-table-column>
+      <el-table-column prop="authenticationStatus" label="状态"></el-table-column>
       <el-table-column prop="address" label="操作">
         <template slot-scope="scope">
           <img
@@ -158,8 +158,7 @@
   </div>
 </template>
 <script>
-// import xx
-// '@/model/houseSelfCollect/index'
+import { getCustomerManage } from '@/model/houseSelfCollect/index'
 import QRCode from 'qrcodejs2'
 import customerManagementAdd from './customerManagementAdd.vue'
 export default {
@@ -172,18 +171,7 @@ export default {
       searchKeyWord: '',
       customerDialogVisible: false,
       creatNewCustomerDialogVisible: false,
-      customertList: {
-        records: [
-          {
-            contractNo: '小王',
-            goodsName: '17127741111',
-            weight: '111111111',
-            unitContractPrice: '312321312132321',
-            packingMethod: '12213321231fsfssfd',
-            status: 'fsdfsdfsd',
-          },
-        ],
-      },
+      customertList: [],
       currentPage: 1,
       pageSize: 10,
       deptBudgetTotal: 0,
@@ -193,6 +181,9 @@ export default {
       searchType: '',
     }
   },
+  activated() {
+    this.getList()
+  },
   methods: {
     find() {
       console.log('搜索')
@@ -208,7 +199,6 @@ export default {
           text: 'https://www.baidu.com',
           colorDark: '#109dff',
           colorLight: '#d9d9d9',
-          
         })
       })
     },
@@ -259,7 +249,18 @@ export default {
           return false
         })
     },
-    getList() {},
+    getList() {
+         getCustomerManage({
+        compId: sessionStorage.getItem('ws-pf_compId'),
+        currentPage: this.currentPage,
+        pageSize: this.pageSize,
+      })
+        .toPromise()
+        .then((response) => {
+         console.log(response)
+         this.customertList = response.records
+        })
+    },
   },
 }
 </script>

+ 352 - 118
src/views/houseSelfCollect/customerManagementAdd.vue

@@ -1,9 +1,9 @@
 <!--客户管理-->
 <template>
-  <div class="content">
-     <!-- <el-row>
+  <div class="center">
+    <el-row>
       <el-col :span="12">
-        <h2 class="bg-left titleup">{{ information }}质检信息</h2>
+        <h2 class="bg-left titleup">新增粮商</h2>
       </el-col>
       <el-col :span="12" class="bg-right">
         <el-button class="bg-bottom" type="primary" size="small" @click="cancel"
@@ -16,42 +16,151 @@
           />返回</el-button
         >
       </el-col>
-    </el-row> -->
-    <div class="title">新增粮商</div>
+    </el-row>
+    <!-- <div>
+
+    </div> -->
+    <!-- <div class="title">新增粮商</div> -->
     <div class="unload">
-      <el-upload action="https://jsonplaceholder.typicode.com/posts/" :limit="2" list-type="picture-card"
-        :on-preview="handlePictureCardPreview" :on-remove="handleRemove">
-        <i class="el-icon-plus"></i>
-      </el-upload>
-      <el-form ref="form" :model="form" label-width="120px">
-        <el-form-item label="姓名">
-          <el-input v-model="form.name"></el-input>
-        </el-form-item>
-        <el-form-item label="身份证号">
-          <el-input v-model="form.name"></el-input>
-        </el-form-item>
-        <el-form-item label="银行卡号">
-          <el-input v-model="form.name"></el-input>
-        </el-form-item>
-        <el-form-item label="开户行">
-          <el-input v-model="form.name"></el-input>
-        </el-form-item>
-        <el-form-item label="开户支行">
-          <el-input v-model="form.name"></el-input>
-        </el-form-item>
-        <el-form-item label="收款人姓名">
-          <el-input v-model="form.name"></el-input>
-        </el-form-item>
-        <el-form-item label="收款人身份证号">
-          <el-input v-model="form.name"></el-input>
-        </el-form-item>
-        <el-form-item label="手机号">
+      <ws-form ref="customerList" :model="customerList" label-width="120px">
+        <ws-info-table>
+          <div style="display: flex; width: 100%; text-align: center">
+              <div style="width: 50%;margin:0 auto">
+                上传身份证正面
+                <el-upload
+                    action="https://www.zthymaoyi.com/upload/admin"
+                  :limit="1"
+                  list-type="picture-card"
+                  :on-preview="handlePictureCardPreview"
+                  :on-remove="handleRemove"
+                  :auto-upload="true"
+                  :on-success="upLoadSuccess1"
+                >
+                  <i class="el-icon-plus"></i>
+                </el-upload>
+              </div>
+              <div style="width: 50%;margin:0 auto">
+                上传身份证反面
+                <el-upload
+                    action="https://www.zthymaoyi.com/upload/admin"
+                  :limit="1"
+                  list-type="picture-card"
+                  :on-preview="handlePictureCardPreview"
+                  :on-remove="handleRemove"
+                   :auto-upload="true"
+                   :on-success="upLoadSuccess2"
+                >
+                  <i class="el-icon-plus"></i>
+                </el-upload>
+              </div>
+          </div>
+
+          <ws-form-item label="姓名" span="1" prop="customerName">
+            <ws-input
+              v-model="customerList.customerName"
+              placeholder="请输入姓名"
+              maxlength="100"
+              size="small"
+              :disabled="disabled"
+            />
+          </ws-form-item>
+          <ws-form-item label="身份证号" span="1" prop="customerNumberCard">
+            <ws-input
+            v-model="customerList.customerNumberCard"
+              placeholder="请输入身份证号"
+              maxlength="100"
+              size="small"
+              :disabled="disabled"
+            />
+          </ws-form-item>
+          <div style="display: flex; width: 100%; text-align: center">
+              <div style="width: 50%;margin:0 auto">
+                上传银行卡正面
+                <el-upload
+                    action="https://www.zthymaoyi.com/upload/admin"
+                  :limit="1"
+                  list-type="picture-card"
+                  :on-preview="handlePictureCardPreview"
+                  :on-remove="handleRemove1"
+                  :auto-upload="true"
+                  :on-success="bankSuccess1"
+                >
+                  <i class="el-icon-plus"></i>
+                </el-upload>
+              </div>
+              <div style="width: 50%;margin:0 auto">
+                上传银行卡反面
+                <el-upload
+                    action="https://www.zthymaoyi.com/upload/admin"
+                  :limit="1"
+                  list-type="picture-card"
+                  :on-preview="handlePictureCardPreview"
+                  :on-remove="handleRemove1"
+                   :auto-upload="true"
+                   :on-success="bankSuccess2"
+                >
+                  <i class="el-icon-plus"></i>
+                </el-upload>
+              </div>
+          </div>
+          <ws-form-item label="银行卡号" span="1" prop="bankCard">
+            <ws-input
+            v-model="customerList.bankCard"
+              placeholder="请输入银行卡号"
+              maxlength="100"
+              size="small"
+              :disabled="disabled"
+            />
+          </ws-form-item>
+          <ws-form-item label="开户行" span="1" prop="bankDeposit">
+            <ws-input
+            v-model="customerList.bankDeposit"
+              placeholder="请输入开户行"
+              maxlength="100"
+              size="small"
+              :disabled="disabled"
+            />
+          </ws-form-item>
+          <ws-form-item label="开户支行" span="1" prop="bankDepositBranch">
+            <ws-input
+            v-model="customerList.bankDepositBranch"
+              placeholder="请输入开户支行"
+              maxlength="100"
+              size="small"
+              :disabled="disabled"
+            />
+          </ws-form-item>
+          <ws-form-item label="收款人姓名" span="1" prop="payeeName">
+            <ws-input
+            v-model="customerList.payeeName"
+              placeholder="请输入收款人姓名"
+              maxlength="100"
+              size="small"
+              :disabled="disabled"
+            />
+          </ws-form-item>
+          <ws-form-item label="收款人身份证号" span="1" prop="payeeNumberCard">
+            <ws-input
+            v-model="customerList.payeeNumberCard"
+              placeholder="请输入收款人身份证号"
+              maxlength="100"
+              size="small"
+              :disabled="disabled"
+            />
+          </ws-form-item>
+          <ws-form-item label="手机号" span="1" prop="customerPhone">
+            <ws-input
+            v-model="customerList.customerPhone"
+              placeholder="请输入手机号"
+              maxlength="100"
+              size="small"
+              :disabled="disabled"
+            />
+          </ws-form-item>
+          <!-- 验证码 -->
+          <!-- <el-form-item prop="veriCode" :label="$t('login.register08')">
           <el-input v-model="form.name"></el-input>
-        </el-form-item>
-        <!-- 验证码 -->
-        <el-form-item prop="veriCode" :label="$t('login.register08')">
-            <el-input v-model="form.name"></el-input>
-   <!--       <div style="display: flex; justify-content: space-between">
+             <div style="display: flex; justify-content: space-between">
             <el-input
               v-model="form.name"
               :disabled="disabledFlag"
@@ -69,103 +178,228 @@
                 >{{ $t('login.retry') }}({{ count }})s</ws-button
               >
             </div>
-          </div> -->
-        </el-form-item>
-        <el-form-item label="联系地址">
-          <el-input v-model="form.name"></el-input>
-        </el-form-item>
-       </el-form>
+          </div> 
+        </el-form-item> -->
+          <ws-form-item label="联系地址" span="1" prop="compAddress">
+            <ws-input
+            v-model="customerList.compAddress"
+              placeholder="请输入联系地址"
+              maxlength="100"
+              size="small"
+              :disabled="disabled"
+            />
+          </ws-form-item>
+        </ws-info-table>
+         <div class="but">
+            <el-button type="primary" @click="commit">提交</el-button>
+            <!-- <el-button  type="primary">关闭</el-button> -->
+          </div>
+      </ws-form>
     </div>
   </div>
 </template>
 <script>
-  // import xx
-  // '@/model/houseSelfCollect/index'
-
-  export default {
-    components: {},
-    watch: {},
-    data() {
-      return {
-        dialogImageUrl: '',
-        dialogVisible: false,
-        form:{
-          name:'姓名'
-        },
-        disabledFlag: true,
+ import {
+  customerAdd
+  }from '@/model/houseSelfCollect/index'
 
-      }
+export default {
+  components: {},
+  watch: {},
+  data() {
+    return {
+      dialogImageUrl: '',
+      dialogVisible: false,
+     customerList:{},
+      disabledFlag: true,
+      disabled: false,
+      identity:[],
+      bank:[],
+    }
+  },
+  methods: {
+    handleRemove(file) {
+      for(let i = 0 ; i < this.identity.length; i++){
+        if(file.response.url == this.identity[i]){
+          this.identity.splice(i,1,"")
+        }
+      } 
     },
-    methods: {
-      handleRemove(file, fileList) {
-        console.log(file, fileList);
-      },
-      handlePictureCardPreview(file) {
-        this.dialogImageUrl = file.url;
-        this.dialogVisible = true;
-      },
-      // 发送验证码
-      toSend() {
-        if (this.registerForm.linkmanPhone) {
-          if (validUserCellPhone(this.registerForm.linkmanPhone)) {
-            this.disabledFlag = false
-            clearInterval(this.timer)
-            this.timer = null
-            const TIME_COUNT = 60
-            if (!this.timer) {
-              this.count = TIME_COUNT
-              this.verification = false
-              let data = {
-                mobilePhone: this.registerForm.linkmanPhone,
-              }
-              sendRegisterCode(data)
-                .toPromise()
-                .then((res) => {
-                  this.timer = setInterval(() => {
-                    if (this.count > 0 && this.count <= TIME_COUNT) {
-                      this.count--
-                    } else {
-                      this.verification = true
-                      clearInterval(this.timer)
-                      this.timer = null
-                    }
-                  }, 1000)
-                })
-                .catch((err) => {
-                  this.verification = true
-                })
+    handleRemove1(file){
+        for(let i = 0 ; i < this.bank.length; i++){
+        if(file.response.url == this.bank[i]){
+          this.bank.splice(i,1,"")
+        }
+      } 
+      console.log(this.bank)
+    },
+    handlePictureCardPreview(file) {
+      this.dialogImageUrl = file.url
+      this.dialogVisible = true
+    },
+    // 发送验证码
+    toSend() {
+      if (this.registerForm.linkmanPhone) {
+        if (validUserCellPhone(this.registerForm.linkmanPhone)) {
+          this.disabledFlag = false
+          clearInterval(this.timer)
+          this.timer = null
+          const TIME_COUNT = 60
+          if (!this.timer) {
+            this.count = TIME_COUNT
+            this.verification = false
+            let data = {
+              mobilePhone: this.registerForm.linkmanPhone,
             }
-          } else {
-            EventBus.$emit('error', this.$t('login.registerVerif09'))
+            sendRegisterCode(data)
+              .toPromise()
+              .then((res) => {
+                this.timer = setInterval(() => {
+                  if (this.count > 0 && this.count <= TIME_COUNT) {
+                    this.count--
+                  } else {
+                    this.verification = true
+                    clearInterval(this.timer)
+                    this.timer = null
+                  }
+                }, 1000)
+              })
+              .catch((err) => {
+                this.verification = true
+              })
           }
         } else {
-          EventBus.$emit('error', this.$t('login.registerVerif05'))
+          EventBus.$emit('error', this.$t('login.registerVerif09'))
         }
-      },
-    }
-  }
+      } else {
+        EventBus.$emit('error', this.$t('login.registerVerif05'))
+      }
+    },
+    cancel() {
+       this.$router.push({ path: 'customerManagement' })
+    },
+    upLoadSuccess1(e){
+      this.identity[0] = e.url
+    },
+     upLoadSuccess2(e){
+      this.identity[1] = e.url
+    },
+    bankSuccess1(e){
+      this.bank[0] = e.url
+    },
+     bankSuccess2(e){
+      this.bank[1] = e.url
+     },
+     commit(){
+       this.$confirm(
+        '确定提交客户信息?',
+        '提示',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }
+      )
+        .then(() => {
+          this.customerList. compId = sessionStorage.getItem('ws-pf_compId')
+         this.customerList.cardAddressUrl = this.identity.toString()
+         this.customerList.payeeAddressUrl = this.bank.toString()
+         this.customerList.customerTypeFlag = 1
+         this.customerList.customerType ="个人"
+         console.log( this.customerList)
+         
+
+          customerAdd(this.customerList)
+        .toPromise()
+        .then((response) => {
+
+          // if(response.code == 200){
+          this.$message.success('添加成功')
+          this.$router.push({path:'customerManagement'})
+
+          // }
+         
+        
+        })
+
+
+
+        })
+        .catch(() => {
+          return false
+        })
+     }
+  },
+}
 </script>
 <style lang="scss" scoped>
-  /deep/.el-form-item{
-    margin-bottom: 0;
-  }
-  .content {
-    padding: 20px;
-  }
+// /deep/.el-form-item {
+//   margin-bottom: 0;
+// }
+.center {
+  background: #f6f7fc;
+}
 
-  .seach {
-    display: flex;
-    align-items: center;
+.seach {
+  display: flex;
+  align-items: center;
 
-    .find {
-      width: 32px;
-    }
+  .find {
+    width: 32px;
+  }
 
-    .search-left {
-      display: flex;
-    }
+  .search-left {
+    display: flex;
   }
-  .titleup {
+}
+
+.ws-info-table {
+  border: none;
+  width: 50%;
+  margin: 0 auto;
+}
+.ws-info-table .el-form-item {
+  width: 50%;
+  border: none;
+}
+/deep/.ws-info-table .el-form-item .el-form-item__label {
+  width: 30%;
+  text-align: center;
+  background: #ffffff;
+  font-size: 14px;
+  color: #8890b1;
+}
+/deep/.ws-info-table .el-form-item .el-form-item__content {
+  border: none;
+}
+.bg-left {
+  padding-left: 30px;
+}
+.bg-right {
+  padding-right: 10px;
+  text-align: right;
+}
+.bg-bottom {
+  margin: 15px 0px;
+}
+.titleup {
   position: relative;
 }
+.titleup::before {
+  content: '';
+  display: inline-block;
+  width: 5px;
+  height: 30px;
+  background: #5473e8;
+  position: absolute;
+  left: 0;
+}
+.unload {
+  background: #ffffff;
+  padding-top: 20px;
+}
+.but {
+  text-align: center;
+  margin: 20px auto;
+}
 </style>

+ 9 - 7
src/views/houseSelfCollect/settlement.vue

@@ -23,7 +23,7 @@
     </el-row>
     <div class="substance">
       <ws-form>
-        <div style="width: 60%; margin: 0 auto">
+        <div style="width: 50%; margin: 0 auto">
           <div class="title">基本信息</div>
           <ws-info-table>
             <ws-form-item label="编号" span="1" prop="waterContent">
@@ -320,9 +320,9 @@
             </ws-form-item>
           </ws-info-table>
           <div class="but">
-            <el-button @click="cancel" v-if="this.types == 2" type="primary">取消</el-button>
-            <el-button @click="print" v-if="this.types == 2" type="primary">保存并打印</el-button>
-            <el-button @click="cancel" v-if="this.types == 1" type="primary">关闭</el-button>
+            <el-button @click="cancel" v-if="this.types == 1" type="primary">取消</el-button>
+            <el-button @click="print" v-if="this.types == 1" type="primary">保存并打印</el-button>
+            <el-button @click="cancel" v-if="this.types == 2" type="primary">关闭</el-button>
           </div>
         </div>
       </ws-form>
@@ -350,8 +350,10 @@ export default {
     this.types = this.$route.query.type
     if( this.types == 2){
          this.disabled=true
-         this.information = '查看'
-         
+         this.information = '查看'   
+    }else if(this.types == 1){
+      this.disabled=false
+         this.information = '结算'   
     }
     console.log( this.information)
   },
@@ -381,7 +383,7 @@ export default {
   border: none;
 }
 .ws-info-table .el-form-item {
-  width: 40%;
+  width: 50%;
   border: none;
 }
 /deep/.ws-info-table .el-form-item .el-form-item__label {