Zhang Li, BBF-411-2(Neusoft) 1 rok pred
rodič
commit
f532ea8828

+ 4 - 4
src/api/knowledge/FormUtil.js

@@ -11,16 +11,16 @@ FormUtil.doExport=function (url,params){
     return new Promise(function (resolve, reject) {
         var config={responseType:"blob"};
         rxAjax.postJson(url,params,config).then(res=>{
-            let data = res;
+            let data = res.data
             let fileReader = new FileReader();
             fileReader.onload = function() {
                 const blob = new Blob([data], {type: 'application/vnd.ms-excel'});
-                // const filename = res.headers['content-disposition'];
+                const filename = res.headers['content-disposition'];
                 const downloadElement = document.createElement('a');
                 const href = window.URL.createObjectURL(blob); //创建下载的链接
                 downloadElement.href = href;
-                // var name=decodeURI(filename.split('=')[1].replace(/\"/g, "" ));
-                // downloadElement.download = name;
+                var name=decodeURI(filename.split('=')[1].replace(/\"/g, "" )).slice(7)
+                downloadElement.download = name;
                 document.body.appendChild(downloadElement);
                 downloadElement.click(); //点击下载
                 document.body.removeChild(downloadElement); //下载完成移除元素

+ 25 - 0
src/api/knowledge/agent.js

@@ -0,0 +1,25 @@
+
+import rxAjax from '@/assets/js/ajax.js';
+import apiCommonUrl from './apiCommonUrl'
+// 栏目定义 api接口
+export const returnData = {};
+
+returnData.baseUrl= apiCommonUrl;
+
+
+// 新增/修改代理人
+returnData.create=function (parameter) {
+  var url= returnData.baseUrl + '/knowledgeAgent/create'
+  return rxAjax.postJson(url,parameter).then (res => {
+    return res
+  })
+}
+
+// 查询代理人信息
+returnData.info=function (parameter) {
+  var url= returnData.baseUrl + '/knowledgeAgent/info'
+  return rxAjax.get(url,parameter).then (res => {
+    return res
+  })
+}
+export default returnData

+ 51 - 17
src/layouts/compoment/main/RightToolBar.vue

@@ -92,12 +92,12 @@
                             <span class="text">退出切换公司</span>
                         </a>
                     </a-menu-item>
-                    <!-- <a-menu-item @click="agentSetting">
+                    <a-menu-item @click="agentSetting">
                         <a>
                             <a-icon type="sliders" />
                             <span class="text">设置代理人</span>
                         </a>
-                    </a-menu-item> -->
+                    </a-menu-item>
                     <a-menu-item @click="handleLogout">
                         <a>
                             <a-icon type="logout" />
@@ -162,6 +162,19 @@
                 </a-radio-group>
             </div>
         </a-drawer>
+         <a-modal
+            v-model="showAgentFlag"
+            width="1200"
+            title="设置代理人" 
+            centered>
+            <agent-page ref="agentPageRef" style="width: 1200px; height: 50vh;"></agent-page>
+            <div slot="footer">
+                <div style="text-align:center;">
+                    <a-button type="primary" @click="handleSaveClick">确定</a-button>
+                    <a-button @click="showAgentFlag = false">取消</a-button>
+                </div>
+            </div>
+        </a-modal>  
     </div>
 </template>
 
@@ -185,6 +198,7 @@ import OsInstApi from "@/api/user/org/osInst";
 import OsGroupApi from "@/api/user/org/osGroup";
 import router from '@/router'
 import extendPortal from "@/api/portal/core/extendPortal";
+import agentApi from '@/api/knowledge/agent'
 
 const _menu = [{
     key: 'inline',
@@ -235,7 +249,9 @@ const  _sideBarBackground= [
 export default {
     name: 'right-tool-bar',
     mixins: [extendPortal],
-    components: {},
+    components: {
+        agentPage
+    },
     data() {
         return {
             imgUrl: require('@img/avatar2.jpg'),
@@ -265,7 +281,9 @@ export default {
                 companyId:"",
                 originCompanyId:"",
                 companys:[]
-            }
+            },
+            agentApi,
+            showAgentFlag: false,
         }
     },
     computed: {
@@ -488,19 +506,24 @@ export default {
             )
         },
         agentSetting() {
-            var self = this
-            let mainHeight = window.innerHeight
-            Util.open({
-                    component: agentPage,
-                    curVm: self,
-                    widthHeight:['950px',mainHeight*0.75+'px'],
-                    title: '设置代理人',
-                    data: {
-                        userId: self.user.userId
-                    },
-                },
-                function(action) {}
-            )
+            this.showAgentFlag = true
+                agentApi.info().then(res => {
+                if(res.code == 200) {
+                    this.$refs.agentPageRef.agentForm = res.data
+                }
+            })
+            // Util.open({
+            //         component: agentPage,
+            //         curVm: self,
+            //         widthHeight:['950px',mainHeight*0.75+'px'],
+            //         title: '设置代理人',
+            //         data: {
+            //             userId: self.user.userId
+            //         },
+            //     },
+            //     function(action) {}
+            // )
+            
         },
         getFilePath(fileId) {
             if (fileId && fileId != '') {
@@ -600,6 +623,17 @@ export default {
             this.setCollapsed(true)
             this.setActiveKey(item.key)
             this.$router.push('/knowledge/InfInnerMsgList')
+        },
+        handleSaveClick() {
+            let flag = this.$refs.agentPageRef.handleSubmit()
+            if(flag) {
+                agentApi.create(this.$refs.agentPageRef.agentForm).then(res => {
+                    if(res.code == 200) {
+                        this.$message.success('设置成功')
+                        this.showAgentFlag = false
+                    }
+                })
+            }
         }
     },
 }

+ 1 - 0
src/views/modules/knowledge/statistics/album.vue

@@ -185,6 +185,7 @@ export default {
       timeData:'',
       sort:'knowledgeDesc',
       type:'month',
+      name: 3,
       statistics,
       tabStatus: true,
       barTitle:['专辑数量','知识收录数量'],

+ 4 - 4
src/views/modules/knowledge/statistics/components/lineChange.vue

@@ -12,12 +12,12 @@
       </template>
       <a-icon class="iconType" @click="changePeitype(2)" type="bar-chart" :style="{color:peitype==2?'#4285f4':'#6d6d6d','borderBottom': peitype==2?'1px solid #4285f4':'1px solid #6d6d6d'}"/>    
     </a-tooltip>
-    <!-- <a-tooltip placement="bottom" overlayClassName="tooltipBoxpieChange" v-if="isOrg">
+    <a-tooltip placement="bottom" overlayClassName="tooltipBoxpieChange" v-if="isOrg">
       <template slot="title">
-        <span style="color:#6d6d6d">下载</span>
+        <span style="color:#6d6d6d">导出</span>
       </template>
-      <a-icon class="iconType" type="download" @click="handleDownloadClick" style="color:#6d6d6d;border-bottom:1px solid #6d6d6d;margin-left:10px;"/>
-    </a-tooltip> -->
+      <a-icon class="iconType" type="export" @click="handleDownloadClick" style="color:#6d6d6d;border-bottom:1px solid #6d6d6d;margin-left:10px;"/>
+    </a-tooltip>
   </div>
 </template>
 

+ 7 - 10
src/views/modules/knowledge/statistics/components/orgPeople.vue

@@ -20,16 +20,16 @@
             <div style="flex:1;display: flex;align-items:center;flex-wrap:wrap;max-height:53px;overflow-y:scroll;">
                 <template v-if="chooseTags.length">
                     <!-- <div style="border:1px solid #e8e8e8;padding: 2px 3px;margin: 1px 2px;border-radius:2px;" v-for="(item,index) in chooseTags" :key="index">{{ item.name }}</div> -->
-                    <!-- <a-tag style="margin-bottom: 2px;margin-top: 2px" 
+                    <a-tag style="margin-bottom: 2px;margin-top: 2px" 
                             v-for="(item,index) in chooseTags" 
                             :key="index" 
                             closable 
-                            @close="handleTagClose(index,item.id)">{{ item.name }}
-                        </a-tag> -->
-                    <a-tag style="margin-bottom: 2px;margin-top: 2px" 
+                            @close="(e) => handleTagClose(e,index,item.id)">{{ item.name }}
+                        </a-tag>
+                    <!-- <a-tag style="margin-bottom: 2px;margin-top: 2px" 
                         v-for="(item,index) in chooseTags" 
                         :key="index">{{ item.name }}
-                    </a-tag>
+                    </a-tag> -->
                 </template>
                 <template v-else>
                     <div>未选择组织</div>
@@ -221,7 +221,8 @@
        }
     },
     methods: {
-        handleTagClose(index,id) {
+        handleTagClose(e,index,id) {
+            e.preventDefault()
             this.chooseTags.splice(index,1)
             if(this.checkedKeys.checked.some(item => item == id)) {
                 this.checkedKeys.checked.map((item,index) => {
@@ -230,18 +231,15 @@
                     }
                 })
             }
-
         },
         // 多选节点
         check(selKeys, e) {
-            // console.log(this.orgDataTree[index].checkedKeys.checked)
             if(e.checked) {
                 this.checkedKeys.checked = selKeys
                 this.chooseTags.push({
                     id: e.node.value,
                     name: e.node.title
                 })
-                console.log(this.chooseTags)
             } else {
                 let id = e.node.value
                 this.checkedKeys.checked = selKeys
@@ -485,7 +483,6 @@
             if (treeNode.dataRef.children) {
                 return;
             }
-            // console.log(treeNode)
             return OsGroupApi.getParentGroup(treeNode.dataRef.groupId).then(data => {
                 let treeData = []
                 for (let i = 0; i < data.length; i++) {

+ 1 - 0
src/views/modules/knowledge/statistics/search.vue

@@ -167,6 +167,7 @@ export default {
       peitype:0,
       barDataNum:0,
       type:'month',
+      name: 5,
       timeData:'',
       statistics,
       barData: [0, 200, 901, 300, 1290, 133,1, 200, 901, 300, 1290, 0],

+ 1 - 0
src/views/modules/knowledge/statistics/synthesize.vue

@@ -185,6 +185,7 @@ export default {
         search:0
       },
       type:'month',
+      name: 1,
       timeData:'',
       statistics,
       mapPicture,

+ 1 - 0
src/views/modules/knowledge/statistics/warehouse.vue

@@ -180,6 +180,7 @@ export default {
       barDataNum:0,
       statistics,
       type:'month',
+      name: 2,
       sort:'wikiDesc',
       timeData:'',
       roseData: [ 

+ 187 - 165
src/views/modules/knowledge/warehouse/agent.vue

@@ -1,210 +1,232 @@
 <template>
-    <rx-dialog @handOk="handleSubmit" @cancel="cancel">
-      <rx-layout>
-        <div slot="center">
-          <div class="agent-title">代理人设置基本信息</div>
-          <a-form-model style="border:1px solid #e8e8e8;margin: 0 20px;" ref="knowledgeRef" :model="agentForm" layout="inline">
-            <a-row>
-              <a-col :span="12">
-                <a-form-model-item label="代理描述:" prop="agentDesc">
-                  <a-input style="width:80%;" v-model="agentForm.agentDesc" placeholder="请输入代理描述" />
-                </a-form-model-item>
-              </a-col>
-              <a-col :span="12">
-                 <a-form-model-item label="代理类型:" prop="agentType">
-                    <a-radio-group v-model="agentForm.agentType">
-                      <a-radio :value="1">
-                        全部
-                      </a-radio>
-                    </a-radio-group>
-                </a-form-model-item>
-              </a-col>
-            </a-row>
-            <a-row>
-              <a-col :span="12">
-                <a-form-model-item label="代理给:" prop="forUser">
-                  <a-input style="width:80%;" v-model="agentForm.forUser" placeholder="请输入代理人" />
-                </a-form-model-item>
-              </a-col>
-              <a-col :span="12">
-                <a-form-model-item label="状态:" prop="status">
-                  <a-radio-group v-model="agentForm.status">
-                    <a-radio :value="1">
-                      启用
-                    </a-radio>
-                    <a-radio :value="2">
-                      禁用
-                    </a-radio>
-                  </a-radio-group>
-                </a-form-model-item>
-              </a-col>
-            </a-row>
-            <a-row>
-              <a-col :span="12">
-                <a-form-model-item label="开始时间:" prop="startTime">
-                  <a-date-picker v-model="agentForm.startTime" />
-                </a-form-model-item>
-              </a-col>
-              <a-col :span="12">
-                 <a-form-model-item label="结束时间:" prop="endTime">
-                   <a-date-picker v-model="agentForm.endTime" />
-                </a-form-model-item>
-              </a-col>
-            </a-row>
-            <a-row>
-              <a-form-model-item label="描述:" prop="desc">
-                 <a-input v-model="agentForm.desc" type="textarea" :autosize="{minRows: 3, maxRows: 6}" placeholder="请输入描" />
-              </a-form-model-item>
-            </a-row>
-          </a-form-model>
+  <div>
+    <div class="agent-title">流程代理设置基本信息</div>
+    <a-form-model style="margin: 0 20px;" ref="agentRef" :model="agentForm" layout="inline">
+      <a-row class="col-style">
+        <div>代理描述*</div>
+        <div>
+          <a-form-model-item prop="sketch" style="width:95.8%;">
+            <a-input v-model="agentForm.sketch" placeholder="请输入代理描述" />
+          </a-form-model-item>
         </div>
-      </rx-layout>
-
-  </rx-dialog>
+      </a-row>
+      <a-row>
+        <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%;">
+              <div @click="showAuditFlag = true">
+                <a-select v-model="agentForm.tagerName" :showArrow="false" :open="false" placeholder="请选择代理人">
+                    <!-- <a-icon slot="suffixIcon" type="smile" /> -->
+                </a-select>
+              </div>
+            </a-form-model-item>
+          </div>
+        </a-col>
+        <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-radio-group v-model="agentForm.state">
+                <a-radio :value="1">
+                  启用
+                </a-radio>
+                <a-radio :value="2">
+                  禁用
+                </a-radio>
+              </a-radio-group>
+            </a-form-model-item>
+          </div>
+        </a-col>
+      </a-row>
+      <a-row>
+        <a-col :span="12" class="col-style" style="border-top: none;">
+          <div>开始时间*</div>
+          <div>
+            <a-form-model-item prop="startTime" style="width:90%;">
+              <a-date-picker
+                v-model="agentForm.startTime"
+                :disabled-date="disabledStartDate"
+                show-time
+                format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择开始时间"
+                valueFormat="YYYY-MM-DD HH:mm:ss"
+              />
+          </a-form-model-item>
+          </div>
+        </a-col>
+        <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-date-picker
+                v-model="agentForm.endTime"
+                :disabled-date="disabledEndDate"
+                show-time
+                format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择结束时间"
+                valueFormat="YYYY-MM-DD HH:mm:ss"
+              />
+            </a-form-model-item>
+          </div>
+        </a-col>
+      </a-row>
+      <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-input v-model="agentForm.describe" type="textarea" :autosize="{minRows: 3, maxRows: 6}" placeholder="请输入描述" />
+          </a-form-model-item>
+        </div>
+      </a-row>
+    </a-form-model>
+    <a-modal
+      v-model="showAuditFlag"
+      :zIndex="20000"
+      width="800"
+      title="选择组织架构" 
+      centered
+      okText="保存"
+      @ok="handleSaveOk">
+      <org-people style="width: 1100px; height: 60vh;" 
+                  ref="orgModalRef"
+                  isOnlyOrg 
+                  isUseUserNo></org-people>
+    </a-modal>  
+  </div>
 </template>
 <script>
-  import OsUserApi from '@/api/user/org/osUser'
-  import OsusertypeApi from '@/api/user/org/osUserType'
   import { BaseForm,RxDialog,Dialog,RxLayout,Util ,RxTextBoxList} from "jpaas-common-lib"
   import {ACCESS_TOKEN} from "@/store/mutation-types";
-  import moment from 'moment';
-  import osPropertiesGroupApi from '@/api/user/org/osPropertiesGroup'
-
+  import orgPeople from './components/orgPeople'
   export default {
     name: 'agentPage',
     components: {
       RxDialog,
       RxTextBoxList,
       RxLayout,
+      orgPeople
     },
     mixins:[BaseForm],
     data () {
       return {
+        showAuditFlag: false,
         agentForm: {
-          agentDesc: '',
+          sketch: '',
           agentType: 1,
-          forUser: '',
-          status: 1,
+          tagerNo: '',
+          tagerName: undefined,
+          state: 1,
           startTime: '',
           endTime: '',
-          desc: ''
+          describe: ''
         },
-        osUserTypes:[],
-        userTypeName:'无',
-        mainDepId:'',
-        dateFormat:'YYYY-MM-DD HH:mm:ss',
-        jsonArray:[],
-        cpsArray:[],
-        imageUrl:"",
-        loading:false,
-        headers:{},
-        disabled:true,
-        mdl: {},
-        propertiesGroups:[]
+        // agentRules: {  
+        //   sketch: [
+        //     { required: true, message: '请输入代理描述', trigger: 'blur' }
+        //   ],
+        //   tagerName: [
+        //     { required: true, message: '请选择代理人', trigger: 'blur' }
+        //   ],
+        //   startTime: [
+        //     { required: true, message: '请选择开始时间', trigger: 'change' }
+        //   ],
+        //   endTime: [
+        //     { required: true, message: '请选择结束时间', trigger: 'change' }
+        //   ]
+        // }
       }
     },
     created () {
-      var token =Vue.ls.get(ACCESS_TOKEN) ;
-      if (token) {
-        this.headers['Authorization'] = 'Bearer ' + token // 让每个请求携带token--['Authorization']为自定义key 请根据实际情况自行修改
-      }
-      // OsusertypeApi.getAllUserTypeList().then(data=>{
-      //   this.osUserTypes=data;
-      // });
-      // var self=this;
-      // this.pkId=this.userId;
-      // OsUserApi.edit(this.userId).then(data=>{
-      //   this.jsonArray=data.dimArray;
-      //   var userData=data.user;
-      //   userData.mainDepId=data.mainDepId;
-      //   userData.mainDepName=data.mainDepName;
-      //   this.mdl = Object.assign(userData);
-      //   //设置用户数据
-      //   this.form.setFieldsValue(this.mdl);
-      //   //获取用户类型名称
-      //   for (var i=0;i<this.osUserTypes.length;i++){
-      //     if(this.osUserTypes[i].code==self.mdl.userType){
-      //       this.userTypeName=this.osUserTypes[i].name;
-      //     }
-      //   }
-      //   //初始化数据
-      //   this.onload_(this.mdl);
-      // });
-      // this.getPropertiesGroups();
-      // //获取用户的分公司/职位/职等
-      // OsUserApi.getUserCPS().then((res)=>{
-      //     this.cpsArray = res.data;
-      // });
     },
     methods: {
-      validForm(values){
-        if(values.pwd!=values.repwd){
-          this.$message.error("两次输入的密码不一致!")
+      timeToTimestamp(time){
+        let timestamp = Date.parse(new Date(time).toString());
+        //timestamp = timestamp / 1000; //时间戳为13位需除1000,时间戳为13位的话不需除1000
+        console.log(time + "的时间戳为:" + timestamp);
+        return timestamp;
+        //2021-11-18 22:14:24的时间戳为:1637244864707
+      },
+      disabledStartDate(startValue) {
+        const endValue = this.agentForm.endTime;
+        if (!startValue || !endValue) {
           return false;
         }
-        return true;
-      },
-      save(values){
-        console.log(values)
+        // return startValue.valueOf() > endValue.valueOf();
+        return this.timeToTimestamp(startValue) > this.timeToTimestamp(endValue)
       },
-      onload_(values){
-        if(values){
-          if(values.birthday){
-            values.birthday=moment(values.birthday, this.dateFormat);
-          }
-          if(values.photo) {
-            this.imageUrl = this.getFilePath(values.photo);
-          }
+      disabledEndDate(endValue) {
+        const startValue = this.agentForm.startTime;
+        if (!endValue || !startValue) {
+          return false;
         }
+        // return startValue.valueOf() >= endValue.valueOf();
+        return this.timeToTimestamp(startValue) >= this.timeToTimestamp(endValue)
       },
-      getFilePath(fileId){
-        return "/api/api-system/system/core/sysFile/previewFile?fileId=" + fileId;
-      },
-      handleChange(info) {
-        if (info.file.status === 'uploading') {
-          this.loading = true;
-          return;
-        }
-        if (info.file.status === 'done') {
-          var res=info.fileList[info.fileList.length-1].response;
-          if(res.success){
-            this.photo=res.data[0].fileId;
-            this.imageUrl=this.getFilePath(res.data[0].fileId);
-            this.loading=false;
-          }
+      handleSaveOk() {
+        let choosePeople = this.$refs.orgModalRef.checkedTarget
+        if(Object.keys(choosePeople).length) {
+          this.agentForm.tagerNo = choosePeople.approverId
+          this.agentForm.tagerName = choosePeople.approverName
         }
+        this.showAuditFlag = false
       },
-      beforeUpload(file) {
-        const isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png';
-        if (!isJpgOrPng) {
-          this.$message.error('只能上传图片!');
-        }
-        const isLt2M = file.size / 1024 / 1024 < 2;
-        if (!isLt2M) {
-          this.$message.error('图片必须小于2MB!');
+      handleSubmit() {
+        console.log(this.agentForm)
+        let flag = true
+        if(!this.agentForm.sketch) {
+          this.$message.error('请输入代理描述')
+          flag = false
+        } else if(!this.agentForm.tagerName) {
+          this.$message.error('请选择代理人')
+             flag = false
+        } else if(!this.agentForm.startTime) {
+          this.$message.error('请选择开始时间')
+          flag = false
+        }else if(!this.agentForm.endTime) {
+          this.$message.error('请选择结束时间')
+          flag = false
+        } else {
+          return flag
         }
-        return isJpgOrPng && isLt2M;
+                        
       },
-      //获取用户扩展属性组
-      getPropertiesGroups(){
-        var ownerId="";
-        if(this.userId){
-          ownerId=this.userId;
-        }
-        osPropertiesGroupApi.getAllProperties({dimId:"-1",ownerId:ownerId}).then(res=>{
-          this.propertiesGroups=res;
-        });
-      }
+      // save(values){
+      //   this.$refs.agentRef.validate(valid => {
+      //     console.log(values)
+      //     console.log(this.agentForm)
+      //   })
+      // },
     }
   }
 </script>
-<style scoped>
+<style lang="less" scoped>
   .agent-title {
+    font-size: 18px;
     width:100%;
     padding:20px;
     text-align:center;
   }
-  .selectitem >>> .ant-form-item-control{
-    margin-top: 7px;
+  .col-style {
+    display:flex;
+    align-items:center;
+    border:1px solid #e8e8e8;
+    color: #000;
+
+    >div:first-child {
+      width: 120px;
+      text-align:center;
+    }
+
+    >div:last-child {
+      flex:1;
+      border-left:1px solid #e8e8e8;
+      display:flex;
+      justify-content:center;
+      align-items: center;
+    }
   }
+  // .selectitem >>> .ant-form-item-control{
+  //   margin-top: 7px;
+  // }
 </style>

+ 1 - 1
src/views/modules/knowledge/warehouse/auditManageList.vue

@@ -127,7 +127,7 @@
       <a-modal v-model="auditShow" 
                :title="modalTitle" 
                centered
-               okText="保存"
+               okText="提交"
                @ok="handleOk"
                :confirmLoading="saveLoading">
         <a-form ref="labelRef" :model="auditForm" layout="inline">

+ 1 - 1
src/views/modules/knowledge/warehouse/knowledgeAddUpdate.vue

@@ -138,7 +138,7 @@
               </template>
               <a-row :gutter="24" type="flex" justify="end" style="margin-top: 20px;padding-right:12px;">
                 <a-button style="margin-right: 20px;" @click="goBack">取消</a-button>
-                <a-button v-if="!!$route.query.isAudit || !pkId" type="primary" @click="handleSaveClick" :loading="saveLoading">保存</a-button>
+                <a-button v-if="!!$route.query.isAudit || !pkId" type="primary" @click="handleSaveClick" :loading="saveLoading">{{ (!!$route.query.isAudit&& !$route.query.isEdit) ? '提交': '保存' }}</a-button>
               </a-row>
               <a-form-model-item style="font-size:16px;">
                 <span slot="label">&ensp;审批流程</span>

+ 3 - 2
src/views/modules/knowledge/warehouse/knowledgeManageList.vue

@@ -149,7 +149,7 @@
                   @click="handleJumpPathClick"
                   >知识审核</rx-button
                 >
-                <!-- <rx-button alias="reauthor" :butn-icon="'false'" @click="handleReauthorShowClick">批量改派作者</rx-button> -->
+                <rx-button alias="reauthor" :butn-icon="'false'" @click="handleReauthorShowClick">批量改派作者</rx-button>
               </div>
             </div>
           </div>
@@ -208,7 +208,8 @@
         :confirmLoading="saveLoading"
       >
         <a-form ref="labelRef" :model="authorForm" layout="inline">
-          <a-form-item label="原作者:" prop="authors">
+          <a-form-item prop="authors">
+            <span slot="label">&emsp;原作者</span>
             <div @click="handleReauthorShow(1)">
               <a-select
                 v-model="authorForm.authorsName"