页面修改

src/components/sale/b2bcustomlist.vue

@@ -99,12 +99,12 @@
             field: 'Account',
             align: 'left'
           },
-          {
-            name: 'CustomerState',
-            label: '账号状态',
-            field: 'CustomerState',
-            align: 'left'
-          },
+          // {
+          //   name: 'CustomerState',
+          //   label: '账号状态',
+          //   field: 'CustomerState',
+          //   align: 'left'
+          // },
           {
             name: 'ApproveState',
             label: '审核状态',

src/components/sale/customerEdit-form.vue

@@ -129,7 +129,7 @@
           </div>
           <div class="col-6">
             <q-input filled stack-label :dense="false" v-model="objOption.Address" ref="Address" class="col-6 q-pb-lg"
-              label="详细地址" :rules="[val => !!val || '请输入地址']" />
+              label="详细地址"  />
           </div>
         </div>
         <div class="row wrap">

src/components/sale/customerReview-form.vue

@@ -29,19 +29,20 @@
   .info_Item {
     margin: 20px 0;
   }
-  .customHeader{
+
+  .customHeader {
     display: inline-block;
-    width:55px;
-    height:55px;
+    width: 55px;
+    height: 55px;
   }
 </style>
 <template>
-  <q-dialog v-model="persistent" maximized full-height seamless position="right" @hide="closeperForm">
+  <q-dialog v-model="persistent" maximized full-height seamless position="right" @hide="closeAuditCustomerForm">
     <q-card style="margin-top:61px;width:600px" class="no-border-radius customRightDialog">
       <div class="drawerTop">
         <div style="display: flex; align-items: center">
           <div class="className">
-            <div class="classFirst">客户审批</div>
+            <div class="classFirst">{{customerObj.Type==1?"客户审批":"客户详情"}}</div>
           </div>
         </div>
       </div>
@@ -111,16 +112,33 @@
             </span>
           </div>
         </div>
+        <!--审批-->
+        <template v-if="customerObj.Type==1">
+          <div style="display: flex;justify-content: space-between;align-items: center;margin-top: 20px;">
+            <div>审批意见</div>
+            <div>
+              <q-radio v-model="AuditMsg.ApproveState" :val="1" label="通过" />
+              <q-radio v-model="AuditMsg.ApproveState" :val="2" label="驳回" />
+            </div>
+          </div>
+          <q-input filled stack-label :dense="false" v-model="AuditMsg.ApproveContent" type="textarea" label="审批意见" />
 
+        </template>
+        <!--已审批-->
+        <template v-else-if="objOption.ApproveState!=0">
           <div style="display: flex;justify-content: space-between;align-items: center;margin-top: 20px;">
             <div>审批意见</div>
             <div>
-            <q-radio v-model="AuditMsg.ApproveState" :disable="customerObj.Type==2" :val="1" label="通过" />
-            <q-radio v-model="AuditMsg.ApproveState" :disable="customerObj.Type==2" :val="2" label="驳回" />
+              <q-chip color="teal" text-color="white" size="sm" v-if="objOption.ApproveState==1">
+                {{objOption.ApproveStateStr}}
+              </q-chip>
+              <q-chip color="red" text-color="white" size="sm" v-else>
+                {{objOption.ApproveStateStr}}
+              </q-chip>
             </div>
           </div>
-        <q-input filled stack-label :dense="false" :disable="customerObj.Type==2" v-model="AuditMsg.ApproveContent"
-          type="textarea" label="审批意见" />
+          <q-input filled stack-label :dense="false" :disable="true" v-model="AuditMsg.ApproveContent" type="textarea"
+            label="审批意见" />
           <div class="row info_Item" v-if="customerObj.Type==2">
             <div class="col-6">
               <span class="backInfo_Title">审批人：</span>
@@ -133,13 +151,15 @@
               <span class="backOtherInfo">{{ objOption.ApproveTimeStr }}</span>
             </div>
           </div>
+        </template>
+
       </div>
       <div style="margin:30px 10px 0 0;text-align:right;">
-        <q-btn class="q-mr-md" label="关闭" @click="closeperForm()" />
-        <q-btn color="accent" v-if="customerObj.Type==1" class="q-mr-md" label="保存" @click="saveConfig()" />
+        <q-btn class="q-mr-md" label="关闭" @click="closeAuditCustomerForm()" />
+        <q-btn color="accent" v-if="customerObj.Type==1" class="q-mr-md" label="保存" @click="SaveAuditCustomer()" />
       </div>
     </q-card>
-    <div class="dialog-out-close" @click="closeperForm"
+    <div class="dialog-out-close" @click="closeAuditCustomerForm"
       style="height:40px !important;border-top-left-radius: 4px !important;border-bottom-left-radius: 4px !important;">
       <q-icon name="iconfont icon-jujue1" size="26px" />
     </div>
@@ -153,6 +173,8 @@
   export default {
     components: {},
     props: {
+      //customerObj.Type==1--审批
+      //customerObj.Type==2--详情
       customerObj: {
         type: Object,
         default: null
@@ -183,6 +205,7 @@
             CustomerId: this.customerObj.CustomerId
           }).then(res => {
             var tempData = res.Data;
+            console.log("tempData", tempData);
             this.objOption = tempData;
             this.AuditMsg.CustomerId = tempData.CustomerId;
             this.AuditMsg.ApproveState = tempData.ApproveState;
@@ -191,8 +214,8 @@
         }
       },
       //保存
-      saveConfig() {
-        if(this.AuditMsg.ApproveState == 0){
+      SaveAuditCustomer() {
+        if (this.AuditMsg.ApproveState == 0) {
           this.$q.notify({
             type: 'negative',
             position: "top",
@@ -218,16 +241,15 @@
               position: "top",
             });
             this.$emit("success");
-            this.closeperForm()
+            this.closeAuditCustomerForm()
           }
         })
       },
       //关闭弹窗
-      closeperForm() {
+      closeAuditCustomerForm() {
         this.$emit('close');
         this.persistent = false;
       },
     },
   }
-
 </script>
\ No newline at end of file