修改

src/components/sale/customRight-form.vue

@@ -84,14 +84,28 @@
         <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="驳回" />
+            <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="驳回" />
+          </div>
+        </div>
+        <q-input filled stack-label :dense="false" :disable="customerObj.Type==2" 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>
+            <span class="backOtherInfo" v-if="objOption.ApproveName">
+              {{ objOption.ApproveName }}
+            </span>
+          </div>
+          <div class="col-6">
+            <span class="backInfo_Title">审批时间：</span>
+            <span class="backOtherInfo">{{ objOption.ApproveTimeStr }}</span>
           </div>
         </div>
-        <q-input filled stack-label :dense="false" v-model="AuditMsg.ApproveContent" type="textarea" label="审批意见" />
       </div>
       <div style="margin:30px 10px 0 0;text-align:right;">
-        <q-btn color="accent" class="q-mr-md" label="保存" @click="saveConfig()" />
+        <q-btn color="accent" v-if="customerObj.Type==1" class="q-mr-md" label="保存" @click="saveConfig()" />
+        <q-btn color="accent" v-else class="q-mr-md" label="取消" @click="closeperForm()" />
       </div>
     </q-card>
     <div class="dialog-out-close" @click="closeperForm"
@@ -133,17 +147,28 @@
       //初始化表单
       initObj() {
         if (this.customerObj && this.customerObj.CustomerId > 0) {
-         this.AuditMsg.CustomerId = this.customerObj.CustomerId;
+          this.AuditMsg.CustomerId = this.customerObj.CustomerId;
           GetCustomer({
             CustomerId: this.customerObj.CustomerId
           }).then(res => {
             var tempData = res.Data;
             this.objOption = tempData;
+            this.AuditMsg.CustomerId = tempData.CustomerId;
+            this.AuditMsg.ApproveState = tempData.ApproveState;
+            this.AuditMsg.ApproveContent = tempData.ApproveContent;
           })
         }
       },
       //保存
       saveConfig() {
+        if (this.AuditMsg.ApproveState == 2 && this.AuditMsg.ApproveContent == '') {
+          this.$q.notify({
+            type: 'negative',
+            position: "top",
+            message: `请填写审批意见`
+          })
+          return;
+        }
         AuditCustomer(this.AuditMsg).then(res => {
           if (res.Code == 1) {
             this.$q.notify({

src/pages/sale/peerManagement.vue

@@ -55,7 +55,9 @@
             <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="编辑"
               @click="EditCustom(props.row)" />
             <q-btn flat v-if="props.row.ApproveState==0||props.row.ApproveState==2" size="xs" icon="edit" color="accent"
-              style="font-weight:400" label="客户审批" @click="AuditCustomer(props.row)" />
+              style="font-weight:400" label="客户审批" @click="AuditCustomer(props.row,1)" />
+            <q-btn flat v-if="props.row.ApproveState==1" size="xs" icon="iconfont icon-View" color="accent"
+              style="font-weight:400" label="查看" @click="AuditCustomer(props.row,2)" />
             <q-btn flat v-if="props.row.ApproveState==0" size="xs" icon="delete" color="negative"
               style="font-weight:400" label="删除" @click="RemoveCustomer(props.row)" />
           </q-td>
@@ -208,9 +210,10 @@
         this.isShowCustomForm = true
       },
       //客户审核
-      AuditCustomer(obj) {
+      AuditCustomer(obj,Type) {
         if (obj) {
           this.customerObj = obj
+          this.customerObj.Type = Type;
         } else {
           this.customerObj = null
         }