1.01

pc/wcarrier/comp/authorize.vue

@@ -11,8 +11,8 @@
       <div class="center justify-between p-spacd2">
         <div>授权手机号</div>
         <div>
-          <span class="mr-spac">{{ value }}</span>
-          <el-button type="text" @click="saveTel()">{{
+          <span>{{ value }}</span>
+          <el-button class="ml-spac" type="text" @click="saveTel()" v-if="!$props.readOnly">{{
             bindPhoneText
           }}</el-button>
         </div>
@@ -20,8 +20,8 @@
       <div class="center justify-between p-spacd2 defbt">
         <div>转账授权</div>
         <div
-          class="pointer p-color"
-          :class="{ 'gray-color': !isBindPhone,'green-color':balanceAuthed}"
+          class="p-color"
+          :class="{ 'gray-color': !isBindPhone,'green-color':balanceAuthed,pointer:!$props.readOnly}"
           @click="authEvent(0)"
         >
           <i class="el-icon-loading
@@ -31,8 +31,8 @@
       <div class="center justify-between p-spacd2 defbt" v-if="isDealer">
         <div>提现授权</div>
         <div
-          class="pointer p-color"
-          :class="{ 'gray-color': !isBindPhone,'green-color':withdrawAuthed }"
+          class="p-color"
+          :class="{ 'gray-color': !isBindPhone,'green-color':withdrawAuthed,pointer:!$props.readOnly }"
           @click="authEvent(1)"
         >
           <i class="el-icon-loading
@@ -183,6 +183,10 @@ export default {
     carrierWithdrawInfo: {
       type: Object,
       default: () => ({})
+    },
+    readOnly: {
+      type: Boolean,
+      default: false
     }
   },
   computed: {
@@ -236,6 +240,9 @@ export default {
   },
   methods: {
     authEvent(type) {
+      if (this.$props.readOnly) {
+        return
+      }
       if (!this.isBindPhone) {
         this.authClicked = true
         return

pc/wcarrier/comp/bankInfo.vue

@@ -4,28 +4,28 @@
       平台提现公户<span class="ml-spac gray-color" :class="{ 'green-color': saved }">[ {{saved?'已上报':'未上报'}} ]</span>
     </div>
 
-    <div class="defbb" :class="{ 'read-only': saved }">
+    <div class="defbb" :class="{ 'read-only': isReadOnly }">
       <el-form ref="form" :model="value" :rules="rules" size="mini" label-width="120px" label-position="right"
          class="p-spac pb-spacd4">
         <div class="flex">
           <el-form-item prop="account" label="提现公户账号：" class="mr-spac">
-            <el-input v-model="value.account" placeholder="请输入" ></el-input>
+            <el-input v-model="value.account" placeholder="请输入" v-empty="emptyArgs"></el-input>
           </el-form-item>
           <el-form-item prop="bankName" label="开户行支行：">
-            <el-input v-model="value.bankName" placeholder="请输入" ></el-input>
+            <el-input v-model="value.bankName" placeholder="请输入" v-empty="emptyArgs"></el-input>
           </el-form-item>
         </div>
         <div class="flex">
           <el-form-item prop="bank" label="开户银行：" class="mr-spac">
-            <el-select v-model="value.bank" filterable placeholder="请选择" >
+            <el-select v-model="value.bank" filterable placeholder="请选择" v-empty="emptyArgs">
               <el-option v-for="(item, index) in banks" :key="index" :label="item.bankName" :value="item.bankName">
               </el-option>
             </el-select>
           </el-form-item>
           <el-form-item prop="unionBank" label="支行行号：">
-            <el-input v-model="value.unionBank" placeholder="请输入" ></el-input>
+            <el-input v-model="value.unionBank" placeholder="请输入" v-empty="emptyArgs"></el-input>
           </el-form-item>
-          <div class="ml-spac pt-spac" v-if="!saved">
+          <div class="ml-spac pt-spac" v-if="!isReadOnly">
               <el-button type="text" @click="save()" :loading="$reqState($interfaces.pay.bind_bank).ing">确定上报</el-button>
           </div>
         </div>
@@ -35,7 +35,6 @@
 </template>
 <script>
 
-
 export default {
   name: 'bankInfo',
   data() {
@@ -54,9 +53,19 @@ export default {
     value: {
       type: Object,
       default: () => ({})
+    },
+    readOnly: {
+      type: Boolean,
+      default: null
     }
   },
   computed: {
+    emptyArgs() {
+      return { open: this.isReadOnly, text: this.$convert.nullViewStr }
+    },
+    isReadOnly() {
+      return (this.readOnly || this.saved)
+    },
 
     saved() {
       return this.value.bankStatus === 2

pc/wcarrier/comp/invoice.vue

@@ -4,7 +4,7 @@
     <el-form
       ref="form"
       :model="value"
-      :disabled="$props.disabled"
+      :disabled="disabledFinal"
       size="mini"
       label-width="110px"
       label-position="left"
@@ -66,14 +66,17 @@ export default {
     },
     readOnly: {
       type: Boolean,
-      default: null
+      default: false
     },
     disabled: {
       type: Boolean,
-      default: null
+      default: false
     }
   },
   computed: {
+    disabledFinal() {
+      return !this.$props.readOnly && this.$props.disabled
+    },
     showOpers() {
       if (this.$props.disabled) {
         return false
@@ -90,7 +93,7 @@ export default {
       return (this.readOnly || !this.isEdit)
     },
     emptyArgs() {
-      return { open: !this.disabled && this.isReadOnly, text: '[ 暂无内容 ]' }
+      return { open: !this.disabledFinal && this.isReadOnly, text: '[ 暂无内容 ]' }
     }
   },
   watch: {

pc/wcarrier/join.vue

@@ -2,15 +2,15 @@
 
 <template>
   <div class="p-fz" v-show="inited">
-    <div class="defbb p-spac">企业认证 [ <span class="gray-color" :class="{ 'green-color': isAuth }">{{ authText }}</span> ]
+    <div class="defbb p-spac">企业认证 [ <span class="label-color" :class="{ 'green-color': isAuth }">{{ authText }}</span> ]
     </div>
-    <div v-if="isAuth" class="s-fz flex p-spac p-b-0">
+    <div v-if="isAuth" class="flex p-spac p-b-0">
       <div class="flex1 defbb ">
-        <div class="chunk1">
+        <div class="chunk1 p-fz">
           <div><span>公司名称：</span>{{ carrierAuthInfo.orgName }}</div>
           <div class=" "><span>统一社会信用代码：</span>{{ carrierAuthInfo.taxpayer }}</div>
         </div>
-        <div class="gray-color defbb p-spac">公司营业执照</div>
+        <div class="label-color defbb p-spac">公司营业执照</div>
         <div class="p-spac">
           <el-image class="big-img" fit="cover" :src="$tools.getFullFileUrl(carrierAuthInfo.businessLicense)"
             :preview-src-list="[$tools.getFullFileUrl(carrierAuthInfo.businessLicense)]">
@@ -18,14 +18,14 @@
         </div>
       </div>
       <div class="flex1 defbb ml-spacm4">
-        <div class="chunk1">
+        <div class="chunk1 p-fz">
           <div class="abs-rt"><span>证件类型：</span>身份证</div>
           <div><span>法人姓名：</span>{{ carrierAuthInfo.legalperson }}</div>
           <div><span>证件号：</span>{{ carrierAuthInfo.idCardNo }}</div>
         </div>
         <div class="flex">
           <div class="mr-spac">
-            <div class="gray-color defbb p-spac">法人身份证人像面</div>
+            <div class="label-color defbb p-spac">法人身份证人像面</div>
             <div class="p-spac">
               <el-image class="small-img" fit="cover" :src="$tools.getFullFileUrl(carrierAuthInfo.idCardFront)"
                 :preview-src-list="[$tools.getFullFileUrl(carrierAuthInfo.idCardFront)]">
@@ -33,7 +33,7 @@
             </div>
           </div>
           <div>
-            <div class="gray-color defbb p-spac">法人身份证人像面</div>
+            <div class="label-color defbb p-spac">法人身份证人像面</div>
             <div class="p-spac">
               <el-image class="small-img" fit="cover" :src="$tools.getFullFileUrl(carrierAuthInfo.idCardBack)"
                 :preview-src-list="[$tools.getFullFileUrl(carrierAuthInfo.idCardBack)]">
@@ -51,15 +51,15 @@
           operateState
         }}</span>
         ]
-        <el-button type="text" v-if="module.carrierRoadInfo.edit && reViewing" @click="getCarrierInfo()"
+        <el-button type="text" v-if="module.select_list && reViewing" @click="getCarrierInfo()"
           :loading="$reqState($interfaces.user.get_carrier_info).ing">刷新</el-button>
 
         <span class="ml-spac p-wcolor" v-if="!isAuth">
           [ 提醒：请先完成“企业认证”！]</span>
       </div>
       <div class="p-spac p-b-0 flex defbb">
-        <div :class="{flex1:!module.carrierRoadInfo.edit}">
-          <div class="gray-color" :class="carrierRoadInfoView ? 'defbb pb-spac' : 'required ml-spac mb-spac'
+        <div :class="{flex1:module.carrierRoadInfo.readOnly}">
+          <div class="label-color" :class="carrierRoadInfoView ? 'defbb pb-spac' : 'required ml-spac mb-spac'
             ">
             道路运输经营许可证
           </div>
@@ -75,10 +75,10 @@
             </el-form-item>
           </el-form>
         </div>
-        <div v-if="!module.carrierRoadInfo.edit" class="flex1 ml-spacm4">
-          <div class="defbb gray-color pb-spac">审核记录</div>
+        <div v-if="!module.select_list" class="flex1 ml-spacm4">
+          <div class="defbb label-color pb-spac">审核记录</div>
           <div class="p-spacd2" v-for="(crir,i) in carrierRoadInfo.records" :key="i">
-            {{ crir.createDate }} {{ crir.createrName }} {{ crir.action }}
+            {{$tools.formatDate(crir.createDate) }} {{ crir.createrName }} {{ crir.action }}
           </div>
         </div>
         <div class="flex-column justify-between flex-items-start ml-spac pb-spac" v-else>
@@ -92,19 +92,47 @@
         </div>
       </div>
     </template>
-    <template v-if="$props.module.carrierFpInfo">
+    <template v-if="$props.module.carrierFpInfo.show">
       <div class="defbb p-spac">
         开票补充信息<span class="ml-spac p-wcolor" v-if="!isreView">[ 提醒：请先完成“资质审核”！]</span>
       </div>
-      <invoice :disabled="!isreView" :readOnly="!module.carrierFpInfo.edit" v-model="carrierFpInfo" class="p-spacd2 p-b-0" />
+      <invoice :disabled="!isreView" :readOnly="module.carrierFpInfo.readOnly" v-model="carrierFpInfo" class="p-spacd2 p-b-0" />
+    </template>
+    <template v-if="$props.module.fundManagement">
+      <div class="defbb p-spac">
+        资金管理设置
+      </div>
+      <div class="p-spac defbb">
+        <div class="flex">
+
+        <div class="flex1">物流充值交易模式：{{ $convert.getTypeStr('tradeType',tradeType) }}</div>
+        <div class="flex1 mb-spacd2">其他付款启用状态：[ <span class="gray-color" :class="{'green-color':otherPay===1}">{{ $convert.getTypeStr('otherPay',otherPay) }}</span> ]</div>
+        </div>
+        <div>
+        物流充值工具：{{ $convert.getTypeStr('p2pEnable',p2pEnable) }}
+        </div>
+      </div>
     </template>
     <authorize v-model="bindPhone" :carrierBalanceInfo="carrierBalanceInfo" :carrierWithdrawInfo="carrierWithdrawInfo"
-      :tradeType="tradeType" v-if="$props.module.carrierWithdrawInfo && isreView" />
-    <bankInfo v-model="carrierBankInfo" v-if="tradeType===1"/>
+      :tradeType="tradeType" :readOnly="module.authorize.readOnly" v-if="$props.module.authorize.show && isreView" />
+    <bankInfo v-model="carrierBankInfo" :readOnly="module.carrierBankInfo.readOnly" v-if="showBankInfo"/>
     <review class="w50" :orgId="safeOrgId" v-if="$props.module.review" @feedback="reviewFeedback" />
-    <div class="p-spac">
-      合同签约<span class="ml-spac gray-color" :class="{'green-color':contracted}">[ {{ contracted ?'已签约 (线下)':'未知' }} ]</span>
+    <div class="p-spac" v-if="module.carrierContractInfo">
+      合同签约 [ <span class="gray-color" :class="{'green-color':contracted}">{{$convert.getTypeStr('contractStatus',carrierContractInfo.contractStatus)}}</span> ]
     </div>
+    <div class="p-spac" v-if="module.status">
+      <div>
+      启用状态:
+            <el-radio v-model="status" :label="0" >启用</el-radio>
+            <el-radio v-model="status" :label="1" >停用</el-radio>
+            </div>
+        <div class="p-spac">
+            <el-button type="primary" size="small" @click="submitStatus" :loading="$reqState($interfaces.user.edit_status).ing">确定</el-button>
+            <el-button size="small" @click="$emit('statusFeedback',0)">取消</el-button>
+        </div>
+
+    </div>
+
   </div>
 </template>
 <script>
@@ -121,8 +149,14 @@ export default {
     const _this = this
     return {
       args: {},
+      /** 启用状态 0-启用，1-停用 */
+      status: 0,
       /** 交易模式(1经销模式;2直销模式，默认经销模式1) */
       tradeType: 1,
+      /** 其他付款状态(挂靠车):默认0关闭，1开启 */
+      otherPay: 0,
+      /** 物流是否允许公对公充值:0-不允许 1-允许 */
+      p2pEnable: 0,
       /** 绑定手机号信息 */
       bindPhone: '',
       /** 企业认证信息 */
@@ -230,18 +264,27 @@ export default {
       default: () => ({
         carrierRoadInfo: {
           show: false,
-          edit: false
+          readOnly: false
         },
         carrierFpInfo: {
           show: false,
-          edit: false
+          readOnly: false
+        },
+        /** 资金管理设置 */
+        fundManagement: false,
+        /** 平台账号授权 */
+        authorize: {
+          show: false,
+          readOnly: false
         },
-        carrierWithdrawInfo: false,
         review: false
       })
     }
   },
   computed: {
+    showBankInfo() {
+      return this.module.carrierBankInfo.show && this.tradeType === 1
+    },
     /** 合同已签约 */
     contracted() {
       return this.carrierContractInfo.contractStatus === 2
@@ -281,7 +324,7 @@ export default {
     },
     // 营运许可证为查看状态
     carrierRoadInfoView() {
-      return !this.module.carrierRoadInfo.edit || this.reViewing || this.isreView
+      return !this.module.select_list || this.reViewing || this.isreView
     },
     reviewBtnText() {
       return this.isReject ? '重新发起审核' : '发起审核'
@@ -291,6 +334,11 @@ export default {
     this.getCarrierInfo()
   },
   methods: {
+    submitStatus() {
+      this.$http(this.$interfaces.user.edit_status, { orgId: this.safeOrgId, status: this.status }).then(() => {
+        this.$emit('statusFeedback', 1)
+      })
+    },
     init(args) {
       this.args = args
       this.getCarrierInfo()
@@ -308,14 +356,17 @@ export default {
       if (this.safeOrgId) {
         this.$http(this.$interfaces.user.get_carrier_info, { orgId: this.safeOrgId }).then(res => {
           this.bindPhone = res.bindPhone
+          this.status = res.org.status
           this.tradeType = res.org.tradeType
+          this.otherPay = res.org.otherPay
+          this.p2pEnable = res.org.p2pEnable
           this.carrierAuthInfo = res.carrierAuthInfo
           this.carrierBalanceInfo = res.carrierBalanceInfo
           this.carrierBankInfo = res.carrierBankInfo
           this.carrierContractInfo = res.carrierContractInfo
           this.carrierFpInfo = res.carrierFpInfo
           // // 资质审核可编辑&&驳回 清空许可证路径
-          // if (this.module.carrierRoadInfo.edit && res.carrierRoadInfo.roadTransportStatus === 3) {
+          // if (this.module.select_list && res.carrierRoadInfo.roadTransportStatus === 3) {
           //   res.carrierRoadInfo.roadTransport = ''
           // }
           this.carrierRoadInfo = res.carrierRoadInfo