1.01

pc/wcarrier/comp/auth.vue

@@ -1,10 +1,10 @@
 <template>
-  <div class="p-spac">
-    <el-form class="defbb" ref="enterprise" :model="value" :rules="rules" size="mini">
+  <div class="p-spac p-b-0 defbb">
+    <el-form ref="enterprise" :model="value" :rules="rules" size="mini">
       <div class="flex">
-        <div class="flex1 mr-spac">
+        <div class="mr-spacm4">
           <el-form-item prop="businessLicense">
-            <div class="required ml-spac">公司营业执照</div>
+            <div class="required ml-spac label-color">公司营业执照</div>
             <upload-img
               :fileList="lisenceFile"
               :big="true"
@@ -18,12 +18,12 @@
             <el-input v-model="value.orgName" placeholder="上传营业执照照片，自动识别"></el-input>
           </el-form-item>
         </div>
-        <div class="flex1 relative">
-          <div>法人证件类型：身份证</div>
+        <div>
+          <div class="defbb pb-spac"><span class="label-color">法人证件类型：</span>身份证</div>
           <div class="flex">
             <div class="mr-spac">
               <el-form-item prop="idCardFront">
-                <div class="required ml-spac">法人身份证人像面</div>
+                <div class="required ml-spac label-color">法人身份证人像面</div>
                 <upload-img
                   :fileList="idcard1"
                   @uploadOrgPic="uploadOrgPic"
@@ -32,7 +32,7 @@
             </div>
             <div>
               <el-form-item prop="idCardBack">
-                <div class="required ml-spac">法人身份证国徽面</div>
+                <div class="required ml-spac label-color">法人身份证国徽面</div>
                 <upload-img
                   :fileList="idcard2"
                   @uploadOrgPic="uploadOrgPic"
@@ -51,7 +51,6 @@
           </div>
         </div>
       </div>
-      <el-form-item> </el-form-item>
     </el-form>
 
   </div>

pc/wcarrier/comp/authorize.vue

@@ -9,7 +9,7 @@
     </div>
     <div class="items p-spacd2">
       <div class="center justify-between p-spacd2">
-        <div>授权手机号</div>
+        <div class="label-color">授权手机号</div>
         <div>
           <span>{{ value }}</span>
           <el-button class="ml-spac" type="text" @click="saveTel()" v-if="!$props.readOnly">{{
@@ -18,7 +18,7 @@
         </div>
       </div>
       <div class="center justify-between p-spacd2 defbt">
-        <div>转账授权</div>
+        <div class="label-color">转账授权</div>
         <div
           class="p-color"
           :class="{ 'gray-color': !isBindPhone,'green-color':balanceAuthed,pointer:!$props.readOnly}"
@@ -29,7 +29,7 @@
         </div>
       </div>
       <div class="center justify-between p-spacd2 defbt" v-if="isDealer">
-        <div>提现授权</div>
+        <div class="label-color">提现授权</div>
         <div
           class="p-color"
           :class="{ 'gray-color': !isBindPhone,'green-color':withdrawAuthed,pointer:!$props.readOnly }"

pc/wcarrier/comp/bankInfo.vue

@@ -119,6 +119,7 @@ export default {
   .el-input,
   .el-select,
   ::v-deep input {
+    color:inherit;
     font-size: 14px;
     padding: 0;
     border: 0;

pc/wcarrier/comp/invoice.vue

@@ -148,6 +148,7 @@ export default {
       display: none;
     }
     .el-input,.el-select,::v-deep input {
+        color:inherit;
         font-size: 14px;
         padding: 0;
         border:0;

pc/wcarrier/join.vue

@@ -2,22 +2,23 @@
 
 <template>
   <div class="p-fz" v-show="inited">
-    <div class="defbb p-spac">企业认证 [ <span class="label-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="flex p-spac p-b-0">
-      <div class="flex1 defbb ">
+    <div v-if="isAuth" class="flex pl-spac pr-spac defbb">
+      <div :class="{ 'flex1': module.carrierAuthInfo.readOnly }">
         <div class="chunk1 p-fz">
           <div><span>公司名称：</span>{{ carrierAuthInfo.orgName }}</div>
           <div class=" "><span>统一社会信用代码：</span>{{ carrierAuthInfo.taxpayer }}</div>
         </div>
-        <div class="label-color defbb p-spac">公司营业执照</div>
+        <div class="label-color p-spac defbb">公司营业执照</div>
         <div class="p-spac">
           <el-image class="big-img" fit="cover" :src="$tools.getFullFileUrl(carrierAuthInfo.businessLicense)"
             :preview-src-list="[$tools.getFullFileUrl(carrierAuthInfo.businessLicense)]">
           </el-image>
         </div>
       </div>
-      <div class="flex1 defbb ml-spacm4">
+      <div class="ml-spacm4" :class="{ 'flex1': module.carrierAuthInfo.readOnly }">
         <div class="chunk1 p-fz">
           <div class="abs-rt"><span>证件类型：</span>身份证</div>
           <div><span>法人姓名：</span>{{ carrierAuthInfo.legalperson }}</div>
@@ -47,18 +48,18 @@
     <template v-if="module.carrierRoadInfo.show">
       <div class="defbb p-spac">
         资质审核 [
-        <span class="gray-color" :class="{ 'green-color': isreView,'p-wcolor':reViewing }">{{
+        <span class="gray-color" :class="{ 'green-color': isreView, 'p-wcolor': reViewing }">{{
           operateState
         }}</span>
         ]
-        <el-button type="text" v-if="module.select_list && reViewing" @click="getCarrierInfo()"
+        <el-button type="text" v-if="!module.carrierRoadInfo.readOnly && 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.readOnly}">
+        <div :class="{ flex1: module.carrierRoadInfo.readOnly }">
           <div class="label-color" :class="carrierRoadInfoView ? 'defbb pb-spac' : 'required ml-spac mb-spac'
             ">
             道路运输经营许可证
@@ -75,10 +76,10 @@
             </el-form-item>
           </el-form>
         </div>
-        <div v-if="!module.select_list" class="flex1 ml-spacm4">
+        <div v-if="module.carrierRoadInfo.readOnly" 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">
-            {{$tools.formatDate(crir.createDate) }} {{ crir.createrName }} {{ crir.action }}
+          <div class="p-spacd2" v-for="(crir, i) in carrierRoadInfo.records" :key="i">
+            {{ $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>
@@ -88,7 +89,8 @@
           </div>
           <div v-else></div>
           <el-button v-if="isAuth && (unStart || isReject)" type="primary" size="medium" class="auth-btn"
-            @click="transportUp()" :loading="$reqState($interfaces.user.road_transport_up).ing">{{ reviewBtnText }}</el-button>
+            @click="transportUp()" :loading="$reqState($interfaces.user.road_transport_up).ing">{{ reviewBtnText
+            }}</el-button>
         </div>
       </div>
     </template>
@@ -96,7 +98,8 @@
       <div class="defbb p-spac">
         开票补充信息<span class="ml-spac p-wcolor" v-if="!isreView">[ 提醒：请先完成“资质审核”！]</span>
       </div>
-      <invoice :disabled="!isreView" :readOnly="module.carrierFpInfo.readOnly" 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">
@@ -105,31 +108,35 @@
       <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 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) }}
+          物流充值工具：{{ $convert.getTypeStr('p2pEnable', p2pEnable) }}
         </div>
       </div>
     </template>
     <authorize v-model="bindPhone" :carrierBalanceInfo="carrierBalanceInfo" :carrierWithdrawInfo="carrierWithdrawInfo"
       :tradeType="tradeType" :readOnly="module.authorize.readOnly" v-if="$props.module.authorize.show && isreView" />
-    <bankInfo v-model="carrierBankInfo" :readOnly="module.carrierBankInfo.readOnly" v-if="showBankInfo"/>
+    <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" v-if="module.carrierContractInfo">
-      合同签约 [ <span class="gray-color" :class="{'green-color':contracted}">{{$convert.getTypeStr('contractStatus',carrierContractInfo.contractStatus)}}</span> ]
+      合同签约 [ <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 class="mb-spac">
+        启用状态:
+        <el-radio class="ml-spac" v-model="status" :label="0">启用</el-radio>
+        <el-radio v-model="status" :label="1">停用</el-radio>
+      </div>
+      <div class="mb-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>
 
@@ -262,6 +269,9 @@ export default {
     module: {
       type: Object,
       default: () => ({
+        carrierAuthInfo: {
+          readOnly: false
+        },
         carrierRoadInfo: {
           show: false,
           readOnly: false
@@ -324,7 +334,7 @@ export default {
     },
     // 营运许可证为查看状态
     carrierRoadInfoView() {
-      return !this.module.select_list || this.reViewing || this.isreView
+      return this.module.carrierRoadInfo.readOnly || this.reViewing || this.isreView
     },
     reviewBtnText() {
       return this.isReject ? '重新发起审核' : '发起审核'
@@ -365,10 +375,7 @@ export default {
           this.carrierBankInfo = res.carrierBankInfo
           this.carrierContractInfo = res.carrierContractInfo
           this.carrierFpInfo = res.carrierFpInfo
-          // // 资质审核可编辑&&驳回 清空许可证路径
-          // if (this.module.select_list && res.carrierRoadInfo.roadTransportStatus === 3) {
-          //   res.carrierRoadInfo.roadTransport = ''
-          // }
+
           this.carrierRoadInfo = res.carrierRoadInfo
           this.carrierWithdrawInfo = res.carrierWithdrawInfo
         })