Zhang Li, BBF-411-2(Neusoft) před 1 rokem
rodič
revize
5cf2dea48d

+ 3 - 1
src/layouts/compoment/main/RightToolBar.vue

@@ -509,7 +509,9 @@ export default {
             this.showAgentFlag = true
                 agentApi.info().then(res => {
                 if(res.code == 200) {
-                    this.$refs.agentPageRef.agentForm = res.data
+                    if(res.data.state) {
+                        this.$refs.agentPageRef.agentForm = res.data
+                    }
                 }
             })
             // Util.open({

+ 6 - 6
src/views/modules/knowledge/warehouse/agent.vue

@@ -5,7 +5,7 @@
       <a-row class="col-style">
         <div>代理描述*</div>
         <div>
-          <a-form-model-item prop="sketch" style="width:95.8%;">
+          <a-form-model-item prop="sketch" style="width:95.8%;position:relative;top:6px;">
             <a-input v-model="agentForm.sketch" placeholder="请输入代理描述" />
           </a-form-model-item>
         </div>
@@ -14,7 +14,7 @@
         <a-col :span="12" class="col-style" style="border-top: none;">
           <div>代&ensp;理&ensp;给*</div>
           <div>
-            <a-form-model-item prop="tagerName" style="width:90%;">
+            <a-form-model-item prop="tagerName" style="width:90%;position:relative;top:6px;">
               <div @click="showAuditFlag = true">
                 <a-select v-model="agentForm.tagerName" :showArrow="false" :open="false" placeholder="请选择代理人">
                     <!-- <a-icon slot="suffixIcon" type="smile" /> -->
@@ -26,7 +26,7 @@
         <a-col :span="12" class="col-style" style="border-top: none;border-left:none;">
           <div>状&emsp;&emsp;态*</div>
           <div>
-            <a-form-model-item prop="state" style="width:90%;">
+            <a-form-model-item prop="state" style="width:90%;position:relative;top:6px;">
               <a-radio-group v-model="agentForm.state">
                 <a-radio :value="1">
                   启用
@@ -43,7 +43,7 @@
         <a-col :span="12" class="col-style" style="border-top: none;">
           <div>开始时间*</div>
           <div>
-            <a-form-model-item prop="startTime" style="width:90%;">
+            <a-form-model-item prop="startTime" style="width:90%;position:relative;top:6px;">
               <a-date-picker
                 v-model="agentForm.startTime"
                 :disabled-date="disabledStartDate"
@@ -58,7 +58,7 @@
         <a-col :span="12" class="col-style" style="border-top: none;border-left:none;">
           <div>结束时间*</div>
           <div>
-            <a-form-model-item prop="endTime" style="width:90%;">
+            <a-form-model-item prop="endTime" style="width:90%;position:relative;top:6px;">
               <a-date-picker
                 v-model="agentForm.endTime"
                 :disabled-date="disabledEndDate"
@@ -74,7 +74,7 @@
       <a-row class="col-style" style="border-top: none;">
         <div>描&emsp;&emsp;述</div>
         <div>
-          <a-form-model-item prop="describe" style="width:95.8%;margin-top:3px;">
+          <a-form-model-item prop="describe" style="width:95.8%;position:relative;top:7px;">
             <a-input v-model="agentForm.describe" type="textarea" :autosize="{minRows: 3, maxRows: 6}" placeholder="请输入描述" />
           </a-form-model-item>
         </div>

+ 29 - 7
src/views/modules/knowledge/warehouse/knowledgeAddUpdate.vue

@@ -9,7 +9,7 @@
               <a-form-model-item v-if="knowledgeForm.categoryId" label="*所选分类:" prop="categoryId">
                 <a-cascader v-model="knowledgeForm.categoryId" 
                   v-if="!$route.query.isEdit"
-                  class="scroll-ckunk"
+                  class="scroll-ckunk categoryId-style"
                   :popupStyle="{
                     maxWidth: widthVar + 'px',
                     'overflow-x': 'auto'
@@ -20,7 +20,9 @@
                   :fieldNames="{ label: 'name', value: 'pkId', children: 'children' }"
                   placeholder="请选择"
                   changeOnSelect
-                  @change="dropdownVisibleChange" />
+                  @change="dropdownVisibleChange">
+                  <a-icon v-if="!!pkId" slot="suffixIcon" type="" />
+                </a-cascader>
                 <a-cascader v-model="knowledgeForm.categoryId" 
                   v-else
                   class="scroll-ckunk"
@@ -32,10 +34,11 @@
                   :fieldNames="{ label: 'name', value: 'pkId', children: 'children' }"
                   placeholder="请选择"
                   changeOnSelect
-                  @change="dropdownVisibleChange" />
+                  @change="dropdownVisibleChange">
+                </a-cascader>
               </a-form-model-item>
               <a-form-model-item label="*知识类型:" prop="type">
-                <a-select v-model="knowledgeForm.type" placeholder="请选择" :disabled="!!pkId">
+                <a-select v-model="knowledgeForm.type" placeholder="请选择" :disabled="!!pkId" :showArrow="!pkId">
                   <a-select-option v-for="(item,index) in knowledgeList" :key="index" :value="item.value">
                     {{item.label}}
                   </a-select-option>
@@ -300,7 +303,6 @@ export default {
     }
   },
   created() {
-    console.log(!this.$route.query.isEdit)
     this.knowledgeForm = Object.assign({},this.$options.data().knowledgeForm)
     this.auditForm = Object.assign({},this.$options.data().auditForm)
     let pkId = this.$route.query.pkId
@@ -688,12 +690,32 @@ export default {
   padding:0 20px 0 12px;
   background:#f5f5f5;
   cursor:not-allowed;
-  color:rgba(0, 0, 0, 0.25);
+  color:#595959;
+}
+.ant-select-disabled {
+  color:#595959;
+}
+.ant-input[disabled] {
+  color:#595959;
+  -webkit-text-fill-color: #595959;;
 
-  
 }
+.ant-cascader-picker-disabled {
+  color:#595959;
+}
+.ant-select-arrow {
+  color:#595959;
+}
+
 </style>
 <style scoped>
+/deep/ .ant-cascader-picker-arrow {
+  color: #bfbfbf;
+}
+/deep/ .ant-input-disabled{
+  color: #595959;
+  -webkit-text-fill-color: #565656;
+}
 /deep/ .ant-upload.ant-upload-drag {
   width: 30%;
   background: #fff;