知识分享及bug调整

src/api/jy/KnowledgeShareInfoService.js

@@ -0,0 +1,47 @@
+import request from '@/utils/httpRequest'
+import { BUSINESS_PATH as prefix } from "../AppPath";
+
+export default class KnowledgeShareInfoService {
+  list (param) {
+    return request({
+      url: prefix +'/knowledgeShare/info/list',
+      method: 'get',
+      params: param
+    })
+  }
+  save (param) {
+    return request({
+      url: prefix +'/knowledgeShare/info/save',
+      method: 'post',
+      data: param
+    })
+  }
+  findById (id, method,size) {
+    return request({
+      url: prefix +'/knowledgeShare/info/findById',
+      method: 'get',
+      params: {id: id, method: method,size: size}
+    })
+  }
+  remove (id) {
+    return request({
+      url: prefix +'/knowledgeShare/info/removeById',
+      method: 'get',
+      params: {id: id}
+    })
+  }
+  addComment (param) {
+    return request({
+      url: prefix +'/knowledgeShare/info/addComment',
+      method: 'post',
+      data: param
+    })
+  }
+  delComment (id) {
+    return request({
+      url: prefix +'/knowledgeShare/info/delComment',
+      method: 'get',
+      params: {id: id}
+    })
+  }
+}

src/api/jy/KnowledgeShareTypeService.js

@@ -0,0 +1,33 @@
+import request from '@/utils/httpRequest'
+import { BUSINESS_PATH as prefix } from "../AppPath";
+
+export default class KnowledgeShareTypeService {
+  list (param) {
+    return request({
+      url: prefix +'/knowledgeShare/type/list',
+      method: 'get',
+      params: param
+    })
+  }
+  save (param) {
+    return request({
+      url: prefix +'/knowledgeShare/type/save',
+      method: 'post',
+      data: param
+    })
+  }
+  findById (id) {
+    return request({
+      url: prefix +'/knowledgeShare/type/findById',
+      method: 'get',
+      params: {id: id}
+    })
+  }
+  remove (id) {
+    return request({
+      url: prefix +'/knowledgeShare/type/remove',
+      method: 'get',
+      params: {id: id}
+    })
+  }
+}

src/api/jy/WorkContractService.js

@@ -45,7 +45,7 @@ export default class WorkContractService {
 		})
 	}
 
-	delete (ids) {
+	deleteById (ids) {
 		return request({
 			url: prefix + '/jy/workContract/workContractInfo/deleteById',
 			method: 'get',

src/views/jy/knowledgeShare/InfoForm.vue

@@ -0,0 +1,441 @@
+<template>
+  <div>
+    <el-dialog
+      :title="formTitle"
+      :close-on-click-modal="false"
+      dialogDrag
+      width="1200px"
+      @close="close"
+      v-model="visible">
+      <el-form size="middle" :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''"
+               label-width="90px" @submit.native.prevent>
+        <el-row  :gutter="15">
+
+          <el-col :span="24">
+            <el-form-item label="主题" prop="title"
+                          :rules="[
+                          {required: true, message:'主题不能为空', trigger:'blur'}
+                 ]">
+              <el-input :disabled="method === 'view'" v-model="inputForm.title" placeholder="请填写主题"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="24">
+            <el-form-item label="类型" prop="typeId"
+                          :rules="[
+                          {required: true, message:'分享类型不能为空', trigger:'blur'}
+                 ]">
+              <el-select :disabled="method === 'view'" v-model="inputForm.typeId" placeholder="请选择" style="width:100%;">
+                <el-option
+                  v-for="item in typeList"
+                  :value="item.id"
+                  :label="item.klgsType"
+                  :key="item.id">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="24">
+            <el-form-item label="内容" prop="detail"
+                          :rules="[
+                          {required: true, message:'内容不能为空', trigger:'blur'}
+                 ]">
+              <WangEditor :disabled="method === 'view'" ref="contentEditor" v-model="inputForm.detail"
+                          @getUrl="(url, lsUrl) => {
+                        inputForm.editorFilesDTOList.push({temporaryUrl: lsUrl, url: url});
+                        }"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <!-- 附件 -->
+        <UpLoadComponent ref="uploadComponent"></UpLoadComponent>
+
+		<div v-if="method === 'view'">
+			<el-divider v-if="method === 'view'" content-position="left"><i class="el-icon-document"></i>访问日志</el-divider>
+			<div style="height: auto">
+				<vxe-table
+					border
+					show-overflow
+					v-if="method === 'view'"
+					ref="detailTable"
+					class="vxe-table-element"
+					:data="inputForm.visits"
+					@cell-click=""
+					@edit-closed=""
+					highlight-current-row
+					:edit-config="{trigger: 'click', mode: 'cell', showStatus: true, autoClear: true}"
+				>
+					<vxe-table-column field="userName" title="访问人" :edit-render="{}">
+						<template #default="scope">
+							<el-input :disbale="method === 'view'" v-model="scope.row.userName" ></el-input>
+						</template>
+					</vxe-table-column>
+					<vxe-table-column field="firstTime" title="首次访问时间" :edit-render="{}">
+						<template #default="scope">
+							<el-input :disbale="method === 'view'" v-model="scope.row.firstTime" ></el-input>
+						</template>
+					</vxe-table-column>
+					<vxe-table-column field="lastTime" title="最近访问时间" :edit-render="{}">
+						<template #default="scope">
+							<el-input :disbale="method === 'view'" v-model="scope.row.lastTime" ></el-input>
+						</template>
+					</vxe-table-column>
+					<vxe-table-column field="num" title="访问次数" :edit-render="{}">
+						<template #default="scope">
+							<el-input :disbale="method === 'view'" v-model="scope.row.num" ></el-input>
+						</template>
+					</vxe-table-column>
+				</vxe-table>
+				<div class="tableLine"><span class="midText">共有{{inputForm.visitNum}}人访问 <el-link style="color: red" type="text" size="mini" v-show="inputForm.visitNum>3&&lookList" @click="findLogList(inputForm.visits.length)">查看全部</el-link></span></div>
+				<n/>
+				<el-divider></el-divider>
+			</div>
+		</div>
+
+		<div v-if="method === 'view'">
+			<el-form size="middle" :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''" :disabled="false" @submit.native.prevent>
+				<el-divider v-if="method === 'view'" content-position="left"><i class="el-icon-document"></i>发表评论</el-divider>
+				<el-row>
+					<el-col>
+						<el-form-item v-if="method === 'view'" prop="content">
+							<el-input v-model="inputForm.content"
+									  type="textarea"
+									  :rows="5"
+									  :disabled="method !== 'view'"
+									  maxlength="500"
+									  placeholder="请输入评论信息"
+									  show-word-limit>
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-button v-if="method === 'view'" style="float: right" type="primary" size="mini" @click="pushComment()" plain>
+						发表
+					</el-button>
+					<el-button v-if="method === 'view'" style="float: right; margin-right: 20px" type="primary" size="mini" @click="cleanComment()" plain>
+						清空
+					</el-button>
+				</el-row>
+
+				<el-divider v-if="method === 'view'" content-position="left"><i class="el-icon-document"></i>全部评论({{inputForm.comments.length}}条)</el-divider>
+				<div v-if="method === 'view'" v-for="(item, index) in inputForm.comments" v-show="index<initLength">
+					<el-divider></el-divider>
+					<div class="font_div" style="width: 100%; height:30px;"><span>{{item.userId}}</span></div>
+					<div style="margin-left: 20px; height:45px;"><span>{{item.content}}</span></div>
+					<div style="width: 100%; height:30px;">
+						<span>{{item.deff}}</span>
+						<a v-if="create === item.createBy || isAdmin" style="float: right" type="text" size="mini" @click="delComment(item.id)">删除</a>
+					</div>
+				</div>
+				<el-divider></el-divider>
+				<div class="tableLine"><span class="midText"><span v-show="inputForm.comments.length>3&&lookMore">还有{{inputForm.comments.length-3}}条评论</span> <el-link style="color: red" type="text" size="mini" v-show="inputForm.comments.length>3&&lookMore" @click="findComment(inputForm.comments.length)"> 查看全部</el-link></span></div>
+			</el-form>
+
+		</div>
+
+        <KnowledgeShareTypePageForm ref="knowledgeShareTypePageForm" @getProgram="getProgram"></KnowledgeShareTypePageForm>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+      <el-button size="small" @click="close()" icon="el-icon-circle-close">关闭</el-button>
+      <el-button size="small" type="primary" v-if="method != 'view'" @click="doSubmit()" icon="el-icon-circle-check" v-noMoreClick>确定</el-button>
+    </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+  import KnowledgeShareInfoService from '@/api/jy/KnowledgeShareInfoService'
+  import KnowledgeShareTypeService from '@/api/jy/KnowledgeShareTypeService'
+  import UpLoadComponent from '@/views/common/UpLoadComponent'
+  import UserService from '@/api/sys/UserService'
+  import KnowledgeShareTypePageForm from './KnowledgeShareTypePageForm'
+  import WangEditor from '@/components/editor/WangEditor'
+  export default {
+    data () {
+      return {
+		  lookMore:true,
+		  lookList:true,
+		  initLength:3,
+        formTitle: '',
+        method: '',
+        visible: false,
+        loading: false,
+        isAdmin: false,
+        create: '',
+        typeList: [],
+        inputForm: {
+          id: '',
+          typeId: '',
+          title: '',
+          detail: '',
+          visits: [],
+          comments: [],
+          files: [],
+          content: '',
+          editorFilesDTOList: [],
+			pageSize: 3,
+			visitNum:''
+        }
+      }
+    },
+    knowledgeShareInfoService: null,
+    created () {
+      this.knowledgeShareInfoService = new KnowledgeShareInfoService()
+      this.knowledgeShareTypeService = new KnowledgeShareTypeService()
+      this.knowledgeShareTypeService.list().then((data) => {
+        this.typeList = data.records
+      })
+    },
+	  computed :{
+		  bus: {
+			  get () {
+				  // this.$refs.uploadComponent.setDividerName('附件')
+				  return this.inputForm.id
+			  },
+			  set (val) {
+				  this.inputForm.id = val
+			  }
+		  },
+	  },
+	  watch: {
+		  'keyWatch': {
+			  handler (newVal) {
+				  if (this.bus) {
+					  if (this.commonJS.isNotEmpty(this.bus)) {
+						  this.init('', this.bus)
+					  }
+				  } else {
+					  this.$nextTick(() => {
+						  this.$refs.inputForm.resetFields()
+					  })
+				  }
+			  }
+		  },
+		  // 'loading': {
+			//   handler (newVal) {
+			// 	  this.$emit('changeLoading', newVal)
+			// 	  this.$refs.uploadComponent.changeLoading(newVal)
+			//   }
+		  // }
+	  },
+    components: {
+      UpLoadComponent,
+      KnowledgeShareTypePageForm,
+      WangEditor
+    },
+    methods: {
+		getKeyWatch (keyWatch) {
+			this.keyWatch = keyWatch
+		},
+      init (method, id) {
+        this.knowledgeShareTypeService.list().then((data) => {
+          this.typeList = data.records
+        })
+        this.method = method
+        this.inputForm = {
+          id: '',
+          typeId: '',
+          typeName: '',
+          title: '',
+          detail: '',
+          visits: [],
+          comments: [],
+          files: [],
+          content: '',
+          editorFilesDTOList: [],
+			pageSize: 3,
+        }
+        if (method === 'add') {
+          this.formTitle = `新建知识分享`
+        } else if (method === 'edit') {
+          this.inputForm.id = id
+          this.formTitle = '修改知识分享'
+        } else if (method === 'view') {
+          this.inputForm.id = id
+          this.formTitle = '查看知识分享'
+        }
+        this.visible = true
+        this.loading = false
+        this.$nextTick(() => {
+          // this.$refs.uploadComponent.setDividerName('附件')
+          // if (method === 'add') {
+          //   this.$refs.contentEditor.enable()
+          // }
+          if (method === 'edit' || method === 'view') { // 修改或者查看
+            this.loading = true
+            // 富文本处理
+            this.$refs.contentEditor.clear()
+            this.is()
+            this.create = this.$store.state.user.id
+            this.$refs.inputForm.resetFields()
+            this.$refs.uploadComponent.clearUpload()
+            this.knowledgeShareInfoService.findById(this.inputForm.id, method,this.inputForm.pageSize).then((data) => {
+            	console.log('data',data)
+				this.inputForm.visitNum=data.visitNum
+              // 富文本处理
+              if (method === 'view') {
+                this.$refs.contentEditor.disable()
+              } else {
+			    this.$refs.contentEditor.enable()
+			  }
+              this.inputForm = this.recover(this.inputForm, data)
+				if (this.commonJS.isEmpty(this.inputForm.files)) {
+					this.inputForm.files = []
+				}
+
+				// this.$refs.uploadComponent.newUpload(this.method, this.inputForm.files, 'knowledgeShare',null,null,null,null,false)
+              this.inputForm = JSON.parse(JSON.stringify(this.inputForm))
+              this.inputForm.comments = JSON.parse(JSON.stringify(this.inputForm.comments))
+              // 富文本处理
+              // if (this.commonJS.isNotEmpty(this.inputForm.detail)) {
+              //   this.$refs.contentEditor.init(this.inputForm.detail)
+              // }
+				if (this.method === 'view') {
+					this.$refs.uploadComponent.newUpload('view', this.inputForm.files, 'knowledgeShare',null,null,null,null,false)
+				} else {
+					this.$refs.uploadComponent.newUpload('edit', this.inputForm.files, 'knowledgeShare')
+				}
+              this.loading = false
+            })
+          }
+        })
+      },
+      // 表单提交
+      doSubmit () {
+        this.$refs['inputForm'].validate((valid) => {
+          if (valid) {
+            this.loading = true
+            if (this.$refs.uploadComponent.checkProgress()) {
+              this.loading = false
+              return
+            }
+            if (this.commonJS.isEmpty(this.inputForm.files)) {
+              this.inputForm.files = []
+            }
+            this.getEditorFilesDTOList()
+            this.inputForm.files = this.$refs.uploadComponent.getDataList()
+            this.knowledgeShareInfoService.save(this.inputForm).then((data) => {
+              this.close()
+              this.$message.success(data)
+              this.loading = false
+            }).catch(() => {
+              this.loading = false
+            })
+          }
+        })
+      },
+      close () {
+        this.inputForm = {
+          id: '',
+          typeId: '',
+          typeName: '',
+          title: '',
+          detail: '',
+          visits: [],
+          comments: [],
+          files: [],
+          content: '',
+          editorFilesDTOList: []
+        }
+        this.$refs.inputForm.resetFields()
+        this.$refs.uploadComponent.clearUpload()
+        // 富文本处理
+        this.$refs.contentEditor.clear()
+        this.visible = false
+        this.$emit('refreshDataList')
+	    this.lookMore=true,
+	    this.lookList=true,
+	    this.initLength=3
+      },
+      pushComment () {
+        if (this.commonJS.isEmpty(this.inputForm.content)) {
+          this.$message.error('请输入评论内容')
+          return
+        }
+        this.commentForm = {
+          detailId: this.inputForm.id,
+          content: this.inputForm.content
+        }
+        this.loading = true
+        this.knowledgeShareInfoService.addComment(this.commentForm).then(({data}) => {
+          this.init('view', this.inputForm.id)
+          this.$message.success(data)
+          this.loading = false
+        })
+      },
+      cleanComment () {
+        this.inputForm.content = ''
+      },
+      delComment (id) {
+        this.knowledgeShareInfoService.delComment(id)
+        this.init('view', this.inputForm.id)
+      },
+      is () {
+        UserService.is().then(({data}) => {
+          this.isAdmin = data
+        })
+      },
+      // 知识分享类型弹窗选择
+      openProgramPageForm () {
+        this.$refs.knowledgeShareTypePageForm.init()
+      },
+      getProgram (rows) {
+        this.inputForm.typeId = rows[0].id
+        this.inputForm.typeName = rows[0].klgsType
+        this.$forceUpdate()
+      },
+      getEditorFilesDTOList () {
+        let a = []
+        if (this.commonJS.isNotEmpty(this.inputForm.editorFilesDTOList)) {
+          this.inputForm.detail = this.inputForm.detail.replace(/&amp;/g, '&')
+          this.inputForm.editorFilesDTOList.forEach((item) => {
+            if (this.inputForm.detail.includes(item.temporaryUrl)) {
+              a.push(item)
+            }
+          })
+        }
+        this.inputForm.editorFilesDTOList = []
+        a.forEach((item) => {
+          this.inputForm.editorFilesDTOList.push(item)
+        })
+      },
+		findComment(leg){
+			this.lookMore=false
+			this.initLength=leg
+		},
+		findLogList(){
+			this.loading = true
+			this.inputForm.pageSize=999999999
+			console.log('method',this.method)
+			this.knowledgeShareInfoService.findById(this.inputForm.id, this.method,this.inputForm.pageSize).then((data) => {
+				this.$refs.uploadComponent.clearUpload()
+				console.log('data',data)
+				this.inputForm.visitNum=data.visitNum
+				// 富文本处理
+				if (this.method === 'view') {
+					this.$refs.contentEditor.disable()
+				} else {
+					this.$refs.contentEditor.enable()
+				}
+				this.inputForm = this.recover(this.inputForm, data)
+				if (this.commonJS.isEmpty(this.inputForm.files)) {
+					this.inputForm.files = []
+				}
+				this.$refs.uploadComponent.newUpload('view', this.inputForm.files, 'knowledgeShare')
+				this.inputForm = JSON.parse(JSON.stringify(this.inputForm))
+				this.inputForm.comments = JSON.parse(JSON.stringify(this.inputForm.comments))
+				this.loading = false
+				this.lookList=false
+			})
+		}
+    }
+  }
+</script>
+
+<style>
+  .font_div {
+    font-weight: bold; /*加粗*/
+  }
+
+</style>

src/views/jy/knowledgeShare/InfoList.vue

@@ -0,0 +1,223 @@
+<template>
+  <div class="page">
+    <el-form size="default" :inline="true" class="query-form" ref="searchForm" :model="searchForm" @keyup.enter.native="refreshList()" @submit.native.prevent>
+      <!-- 搜索框-->
+      <el-form-item label="主题" prop="title">
+        <el-input size="default" v-model="searchForm.title" placeholder="请输入主题" clearable></el-input>
+      </el-form-item>
+      <el-form-item label="发帖人" prop="createName">
+        <UserSelect :limit='1' :userName="searchForm.createName" @getValue='(value, label) => {searchForm.createName = label}'></UserSelect>
+      </el-form-item>
+
+      <el-form-item>
+        <el-button type="primary" @click="refreshList()" size="default" icon="el-icon-search">查询</el-button>
+        <el-button @click="resetSearch()" size="default" icon="el-icon-refresh-right">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <div class="jp-table top" style="">
+      <vxe-toolbar :refresh="{query: refreshList}" custom>
+        <template #buttons>
+          <el-button v-if="hasPermission('knowledgeShare:InfoList:add')" type="primary" size="default" icon="el-icon-plus" @click="add()">新建</el-button>
+          <el-button v-if="hasPermission('knowledgeShare:InfoList:del')" type="danger"   size="default" icon="el-icon-delete" @click="del()" :disabled="$refs.typeTable && $refs.typeTable.getCheckboxRecords().length === 0" plain>删除</el-button>
+        </template>
+      </vxe-toolbar>
+
+      <el-tabs v-model="typeId" type="card" @tab-click="handleClick">
+        <el-tab-pane :key="index" v-for="(item,index) in typeList" :label="item.klgsType" :name="item.id" :value="item.id"></el-tab-pane>
+      </el-tabs>
+
+      <div style="height: calc(100% - 50px)">
+        <vxe-table
+          border="inner"
+          auto-resize
+          resizable
+          height="auto"
+          :loading="loading"
+          size="default"
+          ref="typeTable"
+          show-header-overflow
+          show-overflow
+          highlight-hover-row
+          :menu-config="{}"
+          :sort-config="{remote:true}"
+          :data="dataList"
+          :checkbox-config="{}">
+          <vxe-column type="seq" width="40"></vxe-column>
+          <vxe-column type="checkbox" width="60" ></vxe-column>
+
+          <vxe-column title="主题" field="title" align="left">
+            <template #default="scope">
+              <el-link  type="primary" :underline="false" v-if="hasPermission('knowledgeShare:InfoList:view')" @click="view(scope.row.id)">{{scope.row.title}}</el-link>
+              <el-link  type="primary" :underline="false" v-else-if="hasPermission('knowledgeShare:InfoList:view')" @click="view(scope.row.id)">{{scope.row.title}}</el-link>
+              <span v-else>{{scope.row.title}}</span>
+            </template>
+          </vxe-column>
+          <vxe-column width="150" title="发帖人" field="createName" align="left"></vxe-column>
+          <vxe-column width="150" title="发帖时间" field="createTime"></vxe-column>
+          <vxe-column width="100" title="阅读量" field="visitNum"></vxe-column>
+          <vxe-column width="100" title="回复量" field="commentNum"></vxe-column>
+
+          <vxe-column title="操作" width="230px" fixed="right" align="center">
+            <template  #default="scope">
+              <el-button v-if="hasPermission('knowledgeShare:InfoList:edit') && (create === scope.row.createName)" type="text"  size="small" @click="edit(scope.row.id)">修改</el-button>
+              <el-button v-if="hasPermission('knowledgeShare:InfoList:del') && (create === scope.row.createName || isAdmin)" type="text"   size="small" @click="del(scope.row.id)">删除</el-button>
+            </template>
+          </vxe-column>
+        </vxe-table>
+        <vxe-pager
+          background
+          size="small"
+          :current-page="tablePage.currentPage"
+          :page-size="tablePage.pageSize"
+          :total="tablePage.total"
+          :page-sizes="[10, 20, 100, 1000, {label: '全量数据', value: 1000000}]"
+          :layouts="['PrevPage', 'JumpNumber', 'NextPage', 'FullJump', 'Sizes', 'Total']"
+          @page-change="currentChangeHandle">
+        </vxe-pager>
+      </div>
+    </div>
+    <InfoForm  ref="infoForm" @refreshDataList="refreshList"></InfoForm>
+  </div>
+</template>
+
+<script>
+  import KnowledgeShareInfoService from '@/api/jy/KnowledgeShareInfoService'
+  import KnowledgeShareTypeService from '@/api/jy/KnowledgeShareTypeService'
+  import InfoForm from './InfoForm'
+  import UserSelect from '@/components/userSelect'
+  import userService from '@/api/sys/UserService'
+  export default {
+    data () {
+      return {
+        typeList: [],
+        typeId: '',
+        searchForm: {
+          title: '',
+          createBy: ''
+        },
+        dataList: [],
+        tablePage: {
+          total: 0,
+          currentPage: 1,
+          pageSize: 10,
+          orders: []
+        },
+        loading: false,
+        isAdmin: false,
+        create: ''
+      }
+    },
+    knowledgeShareInfoService: null,
+    knowledgeShareTypeService: null,
+    created () {
+      this.knowledgeShareInfoService = new KnowledgeShareInfoService()
+      this.knowledgeShareTypeService = new KnowledgeShareTypeService()
+		this.findType()
+    },
+    components: {
+      InfoForm,
+      UserSelect
+    },
+    mounted () {
+
+    },
+    activated () {
+		this.refreshList()
+    },
+	  watch: {
+		  defaultTab(newVal) {
+			  this.typeId = newVal; // 设置第一个标签页为默认选中
+		  }
+	  },
+	  computed: {
+		  defaultTab() {
+			  return this.typeList.length > 0 ? this.typeList[0].id : '';
+		  },
+	  },
+    methods: {
+      // 新增
+      add () {
+        this.$refs.infoForm.init('add', '')
+      },
+      // 修改
+      edit (id) {
+        id = id || this.$refs.typeTable.getCheckboxRecords().map(item => {
+          return item.id
+        })[0]
+        this.$refs.infoForm.init('edit', id)
+      },
+      // 查看
+      view (id) {
+        this.$refs.infoForm.init('view', id)
+      },
+	  findType(){
+		this.knowledgeShareTypeService.list().then((data) => {
+			this.typeList = data.records
+			this.typeId=this.typeList[0].id
+			console.log('id',this.typeId)
+		})
+		  setTimeout(()=>{
+		  	this.refreshList()
+		  },300)
+	  },
+      // 获取数据列表
+	  refreshList () {
+        this.loading = true
+        this.is()
+        this.create =this.$store.state.user.name
+		  this.knowledgeShareInfoService.list({
+          'current': this.tablePage.currentPage,
+          'size': this.tablePage.pageSize,
+          'orders': this.tablePage.orders,
+          'typeId': this.typeId,
+          ...this.searchForm
+        }).then((data) => {
+          this.dataList = data.records
+          this.tablePage.total = data.total
+          this.loading = false
+        })
+      },
+      // 删除
+      del (id) {
+        let ids = id || this.$refs.typeTable.getCheckboxRecords().map(item => {
+          return item.id
+        }).join(',')
+        this.$confirm(`确定删除所选项吗?`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.loading = true
+          this.knowledgeShareInfoService.remove(ids).then((data) => {
+            this.$message.success(data)
+            this.refreshList()
+            this.loading = false
+          })
+        })
+      },
+      resetSearch () {
+        this.typeId = ''
+        this.$refs.searchForm.resetFields()
+        this.refreshList()
+      },
+      // 当前页
+      currentChangeHandle ({ currentPage, pageSize }) {
+        this.tablePage.currentPage = currentPage
+        this.tablePage.pageSize = pageSize
+        this.refreshList()
+      },
+      is () {
+        userService.is().then((data) => {
+          this.isAdmin = data
+        })
+      },
+		handleClick (tab) {
+			const val = tab.props.name
+			this.typeId = val
+			console.log('val',val)
+			this.refreshList()
+		}
+    }
+  }
+</script>

src/views/jy/knowledgeShare/KnowledgeShareTypePageForm.vue

@@ -0,0 +1,155 @@
+<template>
+  <div>
+    <el-dialog
+      title="知识分享类型"
+      :close-on-click-modal="false"
+      v-dialogDrag
+      width="1100px"
+      height="500px"
+      @close="close"
+      @keyup.enter.native=""
+      :append-to-body="true"
+      :visible.sync="visible">
+      <div style="height: calc(100% - 80px);">
+        <el-form size="small" :inline="true" class="query-form" ref="searchForm" :model="searchForm" @keyup.enter.native="refreshList()" @submit.native.prevent>
+          <!-- 搜索框-->
+          <el-form-item label="分享类型" prop="klgsType">
+            <el-input size="small" v-model="searchForm.klgsType" placeholder="请输入分享类型" clearable></el-input>
+          </el-form-item>
+
+          <el-form-item>
+            <el-button type="primary" @click="list()" size="small" icon="el-icon-search">查询</el-button>
+            <el-button @click="resetSearch()" size="small" icon="el-icon-refresh-right">重置</el-button>
+          </el-form-item>
+        </el-form>
+
+        <vxe-table
+          border="inner"
+          auto-resize
+          resizable
+          height="400px"
+          :loading="loading"
+          size="small"
+          ref="programTable"
+          show-header-overflow
+          show-overflow
+          highlight-hover-row
+          :menu-config="{}"
+          :print-config="{}"
+          @sort-change=""
+          :sort-config="{remote:true}"
+          :data="dataList"
+          :checkbox-config="{}">
+          <vxe-column type="seq" width="40"></vxe-column>
+          <vxe-column type="checkbox" width="40px"></vxe-column>
+
+          <vxe-column title="分享类型" field="klgsType" align="left"></vxe-column>
+          <vxe-column width="200" title="分享类型key值" field="klgsKey" align="left"></vxe-column>
+          <vxe-column width="100" title="序号" field="klgsSort"></vxe-column>
+          <vxe-column width="100" title="创建人" field="createBy"></vxe-column>
+          <vxe-column width="100" title="创建时间" field="createDate"></vxe-column>
+
+        </vxe-table>
+        <vxe-pager
+          background
+          size="small"
+          :current-page="tablePage.currentPage"
+          :page-size="tablePage.pageSize"
+          :total="tablePage.total"
+          :page-sizes="[10, 20, 100, 1000, {label: '全量数据', value: 1000000}]"
+          :layouts="['PrevPage', 'JumpNumber', 'NextPage', 'FullJump', 'Sizes', 'Total']"
+          @page-change="currentChangeHandle">
+        </vxe-pager>
+      </div>
+
+      <span slot="footer" class="dialog-footer">
+      <el-button size="small" @click="close()" icon="el-icon-circle-close">关闭</el-button>
+      <el-button size="small" type="primary" v-if="method != 'view'" @click="getProgram()" icon="el-icon-circle-check" v-noMoreClick>确定</el-button>
+    </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+  import KnowledgeShareTypeService from '@/api/jy/KnowledgeShareTypeService'
+  export default {
+    data () {
+      return {
+        title: '',
+        method: '',
+        visible: false,
+        loading: false,
+        tablePage: {
+          total: 0,
+          currentPage: 1,
+          pageSize: 10,
+          orders: []
+        },
+        dataList: [],
+        searchForm: {
+          klgsType: ''
+        },
+        checkType: '',
+        detail: '',
+        isShow: true,
+        num: true // num为true是多选，false是单选
+      }
+    },
+    knowledgeShareTypeService: null,
+    created () {
+      this.knowledgeShareTypeService = new KnowledgeShareTypeService()
+    },
+    components: {
+    },
+    methods: {
+      init () {
+        this.num = true
+        this.visible = true
+        this.list()
+      },
+      // 表单提交
+      getProgram () {
+        let rows
+        if (this.$refs.programTable.getCheckboxRecords().length > 1) {
+          this.$message.error('最多选择一条数据')
+          return
+        }
+        rows = this.$refs.programTable.getCheckboxRecords()
+        this.close()
+        this.$emit('getProgram', rows)
+      },
+      list () {
+        this.loading = true
+        this.knowledgeShareTypeService.list({
+          'current': this.tablePage.currentPage,
+          'size': this.tablePage.pageSize,
+          'orders': this.tablePage.orders,
+          ...this.searchForm
+        }).then((data) => {
+          this.dataList = data.records
+          this.tablePage.total = data.total
+          this.loading = false
+        })
+      },
+      // 当前页
+      currentChangeHandle ({currentPage, pageSize}) {
+        this.tablePage.currentPage = currentPage
+        this.tablePage.pageSize = pageSize
+        this.list()
+      },
+      resetSearch () {
+        this.$refs.searchForm.resetFields()
+        this.list()
+      },
+      close () {
+        this.$refs.searchForm.resetFields()
+        this.visible = false
+      }
+    }
+  }
+</script>
+<style>
+  .messageZindex {
+    z-index:9999 !important;
+  }
+</style>

src/views/jy/knowledgeShare/TypeForm.vue

@@ -0,0 +1,127 @@
+<template>
+  <div>
+    <el-dialog
+      :title="title"
+      :close-on-click-modal="false"
+	  draggable
+      width="500px"
+      @close="close"
+      @keyup.enter.native="doSubmit"
+      v-model="visible">
+      <el-form :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''"  :disabled="method==='view'"
+               label-width="150px" @submit.native.prevent>
+        <el-row  :gutter="15">
+
+          <el-col :span="21">
+            <el-form-item label="分享类型" prop="klgsType"
+                          :rules="[
+                          {required: true, message:'分享类型不能为空', trigger:'blur'}
+                 ]">
+              <el-input v-model="inputForm.klgsType" placeholder="请填写分享类型"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="21">
+            <el-form-item label="分析类型key值" prop="klgsKey"
+                          :rules="[
+                          {required: true, message:'分享类型key值不能为空', trigger:'blur'}
+                 ]">
+              <el-input v-model="inputForm.klgsKey" placeholder="请填写分析类型key值"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="21">
+            <el-form-item label="排序" prop="klgsSort"
+                          :rules="[
+                          {required: true, message:'排序不能为空', trigger:'blur'}
+                 ]">
+              <el-input v-model="inputForm.klgsSort" oninput="value=value.replace(/[^\d]/g,'')" placeholder="请填写排序"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+		<template #footer>
+			<span class="dialog-footer">
+			  <el-button size="default" @click="close()" icon="el-icon-circle-close">关闭</el-button>
+			  <el-button size="default" type="primary" v-if="method != 'view'" @click="doSubmit()" icon="el-icon-circle-check" v-noMoreClick>确定</el-button>
+			</span>
+		</template>
+
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+  import KnowledgeShareTypeService from '@/api/jy/KnowledgeShareTypeService'
+  export default {
+    data () {
+      return {
+        title: '',
+        method: '',
+        visible: false,
+        loading: false,
+        inputForm: {
+          klgsType: '',
+          klgsKey: '',
+          klgsSort: ''
+        }
+      }
+    },
+    knowledgeShareTypeService: null,
+    created () {
+      this.knowledgeShareTypeService = new KnowledgeShareTypeService()
+    },
+    components: {
+    },
+    methods: {
+      init (method, id) {
+        this.method = method
+        this.inputForm = {
+          klgsType: '',
+          klgsKey: '',
+          klgsSort: ''
+        }
+        if (method === 'add') {
+          this.title = `新建知识分享类型`
+        } else if (method === 'edit') {
+          this.inputForm.id = id
+          this.title = '修改知识分享类型'
+        } else if (method === 'view') {
+          this.inputForm.id = id
+          this.title = '查看知识分享类型'
+        }
+        this.visible = true
+        this.loading = false
+        this.$nextTick(() => {
+          if (method === 'edit' || method === 'view') { // 修改或者查看
+            this.loading = true
+            this.$refs.inputForm.resetFields()
+            this.knowledgeShareTypeService.findById(this.inputForm.id).then((data) => {
+              this.inputForm = this.recover(this.inputForm, data)
+              this.inputForm = JSON.parse(JSON.stringify(this.inputForm))
+              this.loading = false
+            })
+          }
+        })
+      },
+      // 表单提交
+      doSubmit () {
+        this.$refs['inputForm'].validate((valid) => {
+          if (valid) {
+            this.loading = true
+            this.knowledgeShareTypeService.save(this.inputForm).then((data) => {
+              this.close()
+              this.$message.success(data)
+              this.$emit('refreshDataList')
+              this.loading = false
+            }).catch(() => {
+              this.loading = false
+            })
+          }
+        })
+      },
+      close () {
+        this.$refs.inputForm.resetFields()
+        this.visible = false
+      }
+    }
+  }
+</script>

src/views/jy/knowledgeShare/TypeList.vue

@@ -0,0 +1,159 @@
+<template>
+  <div class="page">
+    <el-form size="default" :inline="true" class="query-form" ref="searchForm" :model="searchForm" @keyup.enter.native="refreshList()" @submit.native.prevent>
+      <!-- 搜索框-->
+      <el-form-item  label="分享类型" prop="type">
+        <el-input size="default"  v-model="searchForm.klgsType" placeholder="请输入分享类型" clearable></el-input>
+      </el-form-item>
+
+      <el-form-item>
+        <el-button type="primary" @click="refreshList()" size="default" icon="el-icon-search">查询</el-button>
+        <el-button @click="resetSearch()" size="default" icon="el-icon-refresh-right">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <div class="jp-table top" style="">
+      <vxe-toolbar :refresh="{query: refreshList}" custom>
+        <template #buttons>
+          <el-button v-if="hasPermission('knowledgeShare:TypeList:add')" type="primary"  size="default" icon="el-icon-plus" @click="add()">新建</el-button>
+          <el-button v-if="hasPermission('knowledgeShare:TypeList:add')" type="danger"   size="default" icon="el-icon-delete" @click="del()" :disabled="$refs.typeTable && $refs.typeTable.getCheckboxRecords().length === 0" plain>删除</el-button>
+        </template>
+      </vxe-toolbar>
+      <div style="height: calc(100% - 50px)">
+        <vxe-table
+          border="inner"
+          auto-resize
+          resizable
+          height="auto"
+          :loading="loading"
+          size="default"
+          ref="typeTable"
+          show-header-overflow
+          show-overflow
+          highlight-hover-row
+          :menu-config="{}"
+          :sort-config="{remote:true}"
+          :data="dataList"
+          :checkbox-config="{}">
+          <vxe-column type="seq" width="40"></vxe-column>
+          <vxe-column type="checkbox" width="60" ></vxe-column>
+
+          <vxe-column title="分享类型" field="klgsType" align="left"></vxe-column>
+          <vxe-column width="200" title="分享类型key值" field="klgsKey" align="left"></vxe-column>
+          <vxe-column width="100" title="序号" field="klgsSort"></vxe-column>
+          <vxe-column width="100" title="创建人" field="createName"></vxe-column>
+          <vxe-column width="100" title="创建时间" field="createTime"></vxe-column>
+
+          <vxe-column title="操作" width="230px" fixed="right" align="center">
+            <template  #default="scope">
+              <el-button v-if="hasPermission('knowledgeShare:TypeList:add')" type="text"  size="small" @click="edit(scope.row.id)">修改</el-button>
+              <el-button v-if="hasPermission('knowledgeShare:TypeList:add')" type="text"   size="small" @click="del(scope.row.id)">删除</el-button>
+            </template>
+          </vxe-column>
+        </vxe-table>
+        <vxe-pager
+          background
+          size="small"
+          :current-page="tablePage.currentPage"
+          :page-size="tablePage.pageSize"
+          :total="tablePage.total"
+          :page-sizes="[10, 20, 100, 1000, {label: '全量数据', value: 1000000}]"
+          :layouts="['PrevPage', 'JumpNumber', 'NextPage', 'FullJump', 'Sizes', 'Total']"
+          @page-change="currentChangeHandle">
+        </vxe-pager>
+      </div>
+    </div>
+    <TypeForm  ref="typeForm" @refreshDataList="refreshList"></TypeForm>
+  </div>
+</template>
+
+<script>
+  import KnowledgeShareTypeService from '@/api/jy/KnowledgeShareTypeService'
+  import TypeForm from './TypeForm'
+  export default {
+    data () {
+      return {
+        searchForm: {
+          klgsType: ''
+        },
+        dataList: [],
+        tablePage: {
+          total: 0,
+          currentPage: 1,
+          pageSize: 10,
+          orders: []
+        },
+        loading: false
+      }
+    },
+    knowledgeShareTypeService: null,
+    created () {
+      this.knowledgeShareTypeService = new KnowledgeShareTypeService()
+    },
+    components: {
+      TypeForm
+    },
+    mounted () {
+      this.refreshList()
+    },
+    methods: {
+      // 新增
+      add () {
+        this.$refs.typeForm.init('add', '')
+      },
+      // 修改
+      edit (id) {
+        id = id || this.$refs.typeTable.getCheckboxRecords().map(item => {
+          return item.id
+        })[0]
+        this.$refs.typeForm.init('edit', id)
+      },
+      // 查看
+      view (id) {
+        this.$refs.typeForm.init('view', id)
+      },
+      // 获取数据列表
+      refreshList () {
+        this.loading = true
+        this.knowledgeShareTypeService.list({
+          'current': this.tablePage.currentPage,
+          'size': this.tablePage.pageSize,
+          'orders': this.tablePage.orders,
+          ...this.searchForm
+        }).then((data) => {
+          this.dataList = data.records
+          this.tablePage.total = data.total
+          this.loading = false
+        })
+      },
+      // 删除
+      del (id) {
+        let ids = id || this.$refs.typeTable.getCheckboxRecords().map(item => {
+          return item.id
+        }).join(',')
+        this.$confirm(`确定删除所选项吗?`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.loading = true
+          this.knowledgeShareTypeService.remove(ids).then((data) => {
+            this.$message.success(data)
+            this.refreshList()
+            this.loading = false
+          })
+        })
+      },
+      resetSearch () {
+        this.$refs.searchForm.resetFields()
+        this.refreshList()
+      },
+      // 当前页
+      currentChangeHandle ({ currentPage, pageSize }) {
+        this.tablePage.currentPage = currentPage
+        this.tablePage.pageSize = pageSize
+        this.refreshList()
+      }
+    }
+  }
+</script>

src/views/jy/notify/MyNotifyList.vue

@@ -1,12 +1,12 @@
 <template>
   <div class="page">
-      <el-form size="small" :inline="true" class="query-form" ref="searchForm" :model="searchForm" @keyup.enter.native="refreshList()" @submit.native.prevent>
+      <el-form size="default" :inline="true" class="query-form" ref="searchForm" :model="searchForm" @keyup.enter.native="refreshList()" @submit.native.prevent>
             <!-- 搜索框-->
 		     <el-form-item label="标题" prop="title">
-                <el-input size="small" v-model="searchForm.title" placeholder="标题" clearable></el-input>
+                <el-input size="default" v-model="searchForm.title" placeholder="标题" clearable></el-input>
 		     </el-form-item>
         <el-form-item label="查阅状态" prop="readFlag">
-          <el-select size="small" v-model="searchForm.readFlag" placeholder="查阅状态" clearable>
+          <el-select size="default" v-model="searchForm.readFlag" placeholder="查阅状态" clearable>
             <el-option
               v-for="item in $dictUtils.getDictList('oa_notify_read')"
               :key="item.value"
@@ -16,7 +16,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="类型" prop="type">
-          <el-select size="small" v-model="searchForm.type" placeholder="类型" clearable>
+          <el-select size="default" v-model="searchForm.type" placeholder="类型" clearable>
             <el-option
               v-for="item in $dictUtils.getDictList('oa_notify_type')"
               :key="item.value"
@@ -41,16 +41,16 @@
           </el-date-picker>
         </el-form-item>
           <el-form-item>
-            <el-button  type="primary" @click="refreshList()" size="small" icon="el-icon-search">查询</el-button>
-            <el-button @click="resetSearch()" size="small" icon="el-icon-refresh-right">重置</el-button>
+            <el-button  type="primary" @click="refreshList()" size="default" icon="el-icon-search">查询</el-button>
+            <el-button @click="resetSearch()" size="default" icon="el-icon-refresh-right">重置</el-button>
           </el-form-item>
       </el-form>
        <div class="jp-table top">
 
          <vxe-toolbar :refresh="{query: refreshList}" custom>
            <template #buttons>
-             <el-button type="primary" size="small" @click="readAll()">全部标记已读</el-button>
-             <el-button :disabled="$refs.notifyTable && $refs.notifyTable.getCheckboxRecords().length === 0" type="warning" size="small" @click="portionRead()">标记为已读</el-button>
+             <el-button type="primary" size="default" @click="readAll()">全部标记已读</el-button>
+             <el-button :disabled="$refs.notifyTable && $refs.notifyTable.getCheckboxRecords().length === 0" type="warning" size="default" @click="portionRead()">标记为已读</el-button>
            </template>
          </vxe-toolbar>
          <el-tabs v-model="activeName" @tab-click="handleClick">

src/views/jy/notify/NotifyForm.vue

@@ -373,7 +373,7 @@
 		},
       // 查询当前用户是否是管理员用户
       checkIsAdmin () {
-		  UserService.is().then(({data}) => {
+		  UserService.is().then((data) => {
           this.isAdmin = data
         })
       },

src/views/jy/project/ProjectAuditForm.vue

@@ -98,14 +98,6 @@
 						<el-input :disabled="true" v-model="inputForm.createTime" placeholder="请填写创建时间"></el-input>
 					</el-form-item>
 				</el-col>
-
-			</el-row>
-			<el-row  :gutter="15">
-				<el-col :span="24" >
-					<el-divider content-position="left"><i class="el-icon-document"></i>
-						审核人及审核和修改意见
-					</el-divider>
-				</el-col>
 				<el-col :span="12" >
 					<el-form-item label="审核人" prop="auditPeople"
 								  :rules="[
@@ -115,14 +107,23 @@
 											 @update:modelValue='(value) => {inputForm.auditPeople = value}'></UserSelectSignatory>
 					</el-form-item>
 				</el-col>
-				<el-col :span="24" >
+
+			</el-row>
+			<el-row  :gutter="15">
+				<el-col :span="24" v-show="inputForm.status === '2' && status ==='audit'?true:false">
+					<el-divider content-position="left"><i class="el-icon-document"></i>
+						审核人及审核和修改意见
+					</el-divider>
+				</el-col>
+
+				<el-col :span="24" v-if="commonJS.isNotEmpty(inputForm.initialAuditOpinion)">
 					<el-form-item label="审核意见" prop="initialAuditOpinion"
 								  :rules="[
 			 ]">
 						<el-input type="textarea" id="auditData"  :rows="4" :disabled="true" show-word-limit maxlength="500" v-model="inputForm.initialAuditOpinion" placeholder="请填写审核意见"></el-input>
 					</el-form-item>
 				</el-col>
-				<el-col :span="24" >
+				<el-col :span="24" v-if="commonJS.isNotEmpty(inputForm.initialEditOpinion)">
 					<el-form-item label="修改意见" prop="initialEditOpinion"
 								  :rules="[
 			 ]">
@@ -531,6 +532,7 @@
 					this.projectInfoService.downloadFirstAuditTpl(this.inputForm.id, this.inputForm.projectId).then((res) => {
 						console.log('hh',res)
 						// 将二进制流文件写入excel表，以下为重要步骤
+						this.tabName=this.inputForm.projectName+" 报告质量内审单"
 						this.$utils.downloadWord(res, this.tabName)
 						this.loading = false
 					}).catch(function (err) {
@@ -541,8 +543,9 @@
 					})
 				}
 				if (this.tabName === '二级校审') {
-					this.projectInfoService.downloadSecondAuditTpl(this.inputForm.id, this.inputForm.projectId).then((res) => {
+					this.projectInfoService.downloadFirstAuditTpl(this.inputForm.id, this.inputForm.projectId).then((res) => {
 						// 将二进制流文件写入excel表，以下为重要步骤
+						this.tabName=this.inputForm.projectName+" 报告质量内审单"
 						this.$utils.downloadWord(res, this.tabName)
 						this.loading = false
 					}).catch(function (err) {
@@ -553,8 +556,9 @@
 					})
 				}
 				if (this.tabName === '三级校审') {
-					this.projectInfoService.downloadThirdlyAuditTpl(this.inputForm.id, this.inputForm.projectId).then((res) => {
+					this.projectInfoService.downloadFirstAuditTpl(this.inputForm.id, this.inputForm.projectId).then((res) => {
 						// 将二进制流文件写入excel表，以下为重要步骤
+						this.tabName=this.inputForm.projectName+" 报告质量内审单"
 						this.$utils.downloadWord(res, this.tabName)
 						this.loading = false
 					}).catch(function (err) {

src/views/jy/project/ProjectDia.vue

@@ -612,6 +612,7 @@
 						this.inputForm.createByName=data.createById
 						this.inputForm.clientList=data.clientList
 						this.inputForm.members=data.projectMembers
+						this.inputForm.amount=data.contractAmount
 						if (this.commonJS.isEmpty(this.inputForm.members)) {
 							this.inputForm.cwProjectMembersDTOList = []
 						} else {

src/views/jy/project/ProjectForm.vue

@@ -492,6 +492,7 @@
 							this.inputForm.createByName=data.createById
 							this.inputForm.createDate=data.createTime
 							this.inputForm.members=data.projectMembers
+							this.inputForm.amount=data.contractAmount
 							if (this.commonJS.isEmpty(this.inputForm.members)) {
 								this.inputForm.cwProjectMembersDTOList = []
 							} else {

src/views/jy/project/ProjectList.vue

@@ -204,7 +204,7 @@
 					<vxe-column min-width="120" align="center" title="环评资质" field="eiaStatus">
 						<template #default="scope">
 							<!--							<el-link  type="primary" :underline="false" v-if="scope.row.contractStatus ==='1'" @click="viewContract(scope.row.contractId)">{{scope.row.contractName}}</el-link>-->
-							<el-button  type="primary" :underline="false" v-if="scope.row.contractTypeFirst === '2'" :type="$dictUtils.getDictLabel('program_project_list_info_status_info', scope.row.eiaStatus, '')" @click="eiaDetail(scope.row)">{{$dictUtils.getDictLabel("program_project_list_info_status", scope.row.eiaStatus, '未登记')}}</el-button>
+							<el-button effect="dark"  v-if="scope.row.contractTypeFirst === '2'" :type="$dictUtils.getDictLabel('program_project_list_info_status_info', scope.row.eiaStatus, '')" @click="eiaDetail(scope.row)">{{$dictUtils.getDictLabel("program_project_list_info_status", scope.row.eiaStatus, '未登记')}}</el-button>
 							<span v-else  style="color: red">无需登记</span>
 						</template>
 					</vxe-column>
@@ -430,7 +430,7 @@ export default {
 		this.refreshList();
 	},
 	activated(){
-		this.is()
+		// this.is()
 		this.refreshList()
 	},
 	computed:{
@@ -484,6 +484,7 @@ export default {
 				this.tablePage.total = data.total
 				this.loading = false
 			})
+			this.is()
 			// 获取当前登录人的所属项目id集合
 			this.projectInfoService.getHaveProjectIds().then((data) => {
 				if (this.commonJS.isNotEmpty(data)) {
@@ -524,7 +525,7 @@ export default {
 					this.procDefKeyOut = data.key
 				}
 			})
-			processService.getByName('嘉溢-报批签发').then((data) => {
+			processService.getByName('嘉溢-用印流程').then((data) => {
 				if (!this.commonJS.isEmpty(data.id)) {
 					this.processDefinitionReportsId = data.id
 					this.procDefKeyReports = data.key
@@ -1380,7 +1381,7 @@ export default {
 				cancelButtonText: '取消',
 				type: 'warning'
 			}).then(async () => {
-				await this.projectInfoService.queryReportsById(row.reportsSubmitId).then((data) => {
+				await this.signetService.queryById(row.reportsSubmitId).then((data) => {
 					if (data.status !== '2') { // status的值不等于“审核中”，就弹出提示
 						this.$message.error('数据已发生改变或不存在，请刷新数据')
 						this.refreshList()
@@ -1397,7 +1398,7 @@ export default {
 		},
 		//报批签发审核
 		reportsSubmitCheck(row){
-			this.projectInfoService.queryReportsById(row.reportsSubmitId).then((data) => {
+			this.signetService.queryById(row.reportsSubmitId).then((data) => {
 				if (data.status !== '2') { // status的值不等于“审核中”，就弹出提示
 					this.$message.error('数据已发生改变或不存在，请刷新数据')
 					this.refreshList()
@@ -1409,7 +1410,7 @@ export default {
 		// 审核或重新调整跳转  报批签发
 		todoReports (row) {
 			let cUser = false
-			this.projectInfoService.queryReportsById(row.reportsSubmitId).then((data) => {
+			this.signetService.queryById(row.reportsSubmitId).then((data) => {
 				taskService.getTaskDefInfo({
 					taskId: data.taskId
 				}).then((data) => {
@@ -1430,7 +1431,7 @@ export default {
 		},
 		//报批签发驳回后重新调整
 		adjustReportsSubmit(row){
-			this.projectInfoService.queryReportsById(row.reportsSubmitId).then((data) => {
+			this.signetService.queryById(row.reportsSubmitId).then((data) => {
 				if (data.status !== '4') { // status的值不等于“驳回”，就弹出提示
 					this.$message.error('数据已发生改变或不存在，请刷新数据')
 					this.refreshList()
@@ -1452,7 +1453,7 @@ export default {
 			}
 			taskService.getTaskDef({ procDefId: this.processDefinitionReportsId,
 				businessId: row.reportsSubmitId,
-				businessTable: 'jy_project_reports_submit'}).then((data) => {
+				businessTable: 'jy_user_signet'}).then((data) => {
 				this.$router.push({
 					path: '/flowable/task/TaskForm',
 					query: {
@@ -1463,7 +1464,7 @@ export default {
 						formType: data.formType,
 						formUrl: data.formUrl,
 						formTitle: processTitle,
-						businessTable: 'jy_project_reports_submit',
+						businessTable: 'jy_user_signet',
 						businessId: row.reportsSubmitId,
 						isShow: 'false',
 						status: status,

src/views/jy/workClientInfo/WorkClientList.vue

@@ -73,8 +73,10 @@
         </el-form-item>
 
         <el-form-item v-if="showHideItem" label="创建人" prop="createById">
-          <UserSelect :limit='1' :readonly="true" :modelValue="searchForm.createById" @update:modelValue='(value, label) => {searchForm.createById = value}'></UserSelect>
-        </el-form-item>
+			<UserSelectSignatory style="width: 100%" ref="userSelect2"
+								 :readonly="true" :limit='1' :modelValue="searchForm.createById"
+								 @update:modelValue='(value) => {searchForm.createById = value}'></UserSelectSignatory>
+		</el-form-item>
 
 <!--        <el-form-item label="代表方" prop="deputy">-->
 <!--          <el-select v-model="searchForm.deputy" placeholder="请选择" style="width:100%;">-->
@@ -181,6 +183,7 @@
   import SelectTree from '@/components/treeSelect/treeSelect.vue'
   import SelectUserTree from '@/views/utils/treeUserSelect'
   import UserSelect from '@/components/userSelect'
+  import UserSelectSignatory from '../workClientInfo/clientUserSelect'
   export default {
     data () {
       return {
@@ -219,6 +222,7 @@
       SelectTree,
       SelectUserTree,
       UserSelect,
+	  UserSelectSignatory
     },
     activated () {
       this.refreshList()

src/views/jy/workContractInfo/ContractAddForm.vue

@@ -160,7 +160,7 @@
         </el-col>
 
 
-        <el-col :span="12" v-if="inputForm.contractAmountType === '1'">
+        <el-col :span="12">
           <el-form-item label="合同金额(元)" prop="contractAmount"
                         :rules="[
                   {required: true, message:'请输入合同金额(元)', trigger:'blur'}
@@ -170,6 +170,15 @@
             ></el-input>
           </el-form-item>
         </el-col>
+
+		  <el-col :span="12" >
+			  <el-form-item label="归档盒号" prop="filedNo"
+							:rules="[
+											  {required: true, message:'请输入归档盒号', trigger:'blur'}
+										   ]">
+				  <el-input :disabled="false" :readonly="false" maxlength="15" v-model="inputForm.filedNo"  placeholder="请输入归档盒号"></el-input>
+			  </el-form-item>
+		  </el-col>
 		  <el-col>
 			  <el-form-item label="付款摘要" prop="paymentDescribe"
 							:rules="[

src/views/jy/workContractInfo/JyWorkContractList.vue

@@ -56,8 +56,9 @@
 			</el-form-item>
 
 			<el-form-item v-if="showHideItem" label="创建人" prop="createById">
-				<UserSelect :limit='1' :readonly="true" :modelValue="searchForm.createById" @update:modelValue='(value, label) => {searchForm.createById = value}'></UserSelect>
-			</el-form-item>
+				<UserSelectSignatory style="width: 100%" ref="userSelect2"
+									 :readonly="true" :limit='1' :modelValue="searchForm.createById"
+									 @update:modelValue='(value) => {searchForm.createById = value}'></UserSelectSignatory>			</el-form-item>
 
 			<el-form-item v-if="showHideItem" label="登记时间" prop="createDates">
 				<el-date-picker
@@ -83,7 +84,7 @@
 			<vxe-toolbar ref="toolbarRef" :refresh="{query: refreshList}" custom>
 				<template #buttons>
 					<el-button v-if="hasPermission('jy_work_contract:info:add')" type="primary" icon="el-icon-plus" @click="add()">新建</el-button>
-					<el-button v-if="hasPermission('jy_work_contract:info:del')" type="danger"   icon="el-icon-delete" @click="del()" :disabled="$refs.workContractTable && $refs.workContractTable.getCheckboxRecords().length === 0" plain>删除</el-button>
+<!--					<el-button v-if="hasPermission('jy_work_contract:info:del')" type="danger"   icon="el-icon-delete" @click="del()" :disabled="$refs.workContractTable && $refs.workContractTable.getCheckboxRecords().length === 0" plain>删除</el-button>-->
 				</template>
 			</vxe-toolbar>
 			<div class="jp-table-body">
@@ -105,7 +106,7 @@
 					:data="dataList"
 					:checkbox-config="{}">
 					<vxe-column type="seq" width="60" title="序号"></vxe-column>
-					<vxe-column type="checkbox" width="50px"></vxe-column>
+<!--					<vxe-column type="checkbox" width="50px"></vxe-column>-->
 
 					<vxe-column min-width="200px" title="合同编号" field="no" align="center"></vxe-column>
 					<vxe-column min-width="200px" title="合同类型" field="contractType" align="center"></vxe-column>
@@ -142,7 +143,7 @@
 							<!--              合同归档  被驳回后当前申请人重新调整-->
 							<el-button v-if="hasPermission('jy_work_contract:info:edit')&&scope.row.createId === $store.state.user.id&&scope.row.filedType === '4'" text type="primary"   @click="adjustFiled(scope.row)">驳回调整</el-button>
 <!--							删除-->
-							<el-button v-if="hasPermission('jy_work_contract:info:del')&&(scope.row.filedType === '1' || scope.row.filedType === '3') &&scope.row.createId === $store.state.user.id" text type="primary"  @click="delete(scope.row.id)">删除</el-button>
+							<el-button v-if="hasPermission('jy_work_contract:info:del')&&(scope.row.filedType === '0' || scope.row.filedType === '1' || scope.row.filedType === '3') &&scope.row.createId === $store.state.user.id" text type="primary"  @click="deleteById(scope.row.id)">删除</el-button>
 							</template>
 					</vxe-column>
 				</vxe-table>
@@ -177,6 +178,7 @@
 	import UserSelect from '@/components/userSelect'
 	import ContractAddForm from './ContractAddForm'
 	import dictService from "@/api/sys/dictService";
+	import UserSelectSignatory from '../workClientInfo/clientUserSelect'
 	export default {
 		data () {
 			return {
@@ -232,7 +234,8 @@
 			WorkClientForm,
 			SelectUserTree,
 			UserSelect,
-			ContractAddForm
+			ContractAddForm,
+			UserSelectSignatory
 		},
 		activated () {
 			this.is()
@@ -306,8 +309,8 @@
 			// 新增
 			add () {
 				// 读取流程表单
-				let tabTitle = `发起流程【嘉溢-合同归档】`
-				let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 [嘉溢-合同归档]`
+				let tabTitle = `发起流程【嘉溢-合同登记】`
+				let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 [嘉溢-合同登记]`
 				taskService.getTaskDef({ procDefId: this.processDefinitionId,
 					status: 'startAndHold'}).then((data) => {
 					this.$router.push({
@@ -509,8 +512,8 @@
 			//修改
 			//暂存修改
 			updateFiled(row){
-				let tabTitle = `发起流程【嘉溢-合同归档】`
-				let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了[嘉溢-合同归档]`
+				let tabTitle = `发起流程【嘉溢-合同登记】`
+				let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了[嘉溢-合同登记]`
 				let status = 'startAndHold'
 				if (row.filedType === '3') {
 					status = 'startAndClose'
@@ -519,7 +522,7 @@
 				}
 				taskService.getTaskDef({ procDefId: this.processDefinitionId,
 					businessId: row.id,
-					businessTable: 'work_contract_info'}).then((data) => {
+					businessTable: 'jy_work_contract_info'}).then((data) => {
 					this.$router.push({
 						path: '/flowable/task/TaskForm',
 						query: {
@@ -553,8 +556,8 @@
 									query: {
 										...pick(data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title'),
 										readOnly: true,
-										title: '归档流程详情',
-										formTitle: '归档流程详情',
+										title: '合同登记流程详情',
+										formTitle: '合同登记流程详情',
 										businessId: row.id
 									}
 								})
@@ -651,17 +654,14 @@
 				return false
 			},
 			// 删除
-			delete (id) {
-				let ids = id || this.$refs.typeDictTable.getCheckboxRecords().map(item => {
-					return item.id
-				}).join(',')
+			deleteById (id) {
 				this.$confirm(`确定删除所选项吗?`, '提示', {
 					confirmButtonText: '确定',
 					cancelButtonText: '取消',
 					type: 'warning'
 				}).then(() => {
 					this.loading = true
-					this.workContractService.delete(ids).then((data) => {
+					this.workContractService.deleteById(id).then((data) => {
 						this.$message.success(data)
 						this.refreshList()
 						this.loading = false

src/views/jy/workContractInfo/WorkContractForm.vue

@@ -171,12 +171,12 @@
 						</el-form-item>
 					</el-col>
 
-					<el-col :span="12" v-if="$store.state.user.office.name ==='办公室'">
+					<el-col :span="12" v-if="isShow">
 						<el-form-item label="归档盒号" prop="filedNo"
 									  :rules="[
 											  {required: true, message:'请输入归档盒号', trigger:'blur'}
 										   ]">
-							<el-input :disabled="false" :readonly="false" maxlength="15" v-model="inputForm.filedNo"  placeholder="请输入归档盒号"></el-input>
+							<el-input :disabled="status === 'taskFormDetail'" :readonly="false" maxlength="15" v-model="inputForm.filedNo"  placeholder="请输入归档盒号"></el-input>
 						</el-form-item>
 					</el-col>
 
@@ -294,11 +294,13 @@
 		fileName
 	} from '@/api/sys/OSSService'
 	import moment from 'moment'
+	import userService from '@/api/sys/userService'
 	// import ElImageViewer from 'element-ui/packages/image/src/image-viewer'
 	export default {
 		data () {
 			return {
 				visable: false,
+				isShow:true,
 				gridData: [],
 				radio: 0,
 				tableData: [],
@@ -431,6 +433,7 @@
 			this.ossService = new OSSSerive()
 			this.contractService=new WorkContractService()
 			this.workClientService = new WorkClientService()
+			this.checkIsBgs()
 		},
 		mounted () {
 			window.onPreview = this.onPreview
@@ -584,6 +587,9 @@
 							if (this.status === 'audit' || this.status === 'taskFormDetail') {
 								method = 'view'
 							}
+							if (this.status === 'taskFormDetail' && data.filedType === '5'){
+								this.isShow = true
+							}
 							this.$refs.uploadComponent.newUpload(method, this.inputForm.workAttachmentList, 'jyWorkContract', null, null, null, null, false)
 							// this.$refs.archiveFile.newUpload('view', [], 'cwWorkContract', null, null, null, null, false)
 							this.loading = false
@@ -951,43 +957,17 @@
 
 			// 表单提交
 			// 暂存
-			saveForm () {
+			saveForm (callback) {
 				this.loading = true
-				if (this.commonJS.isEmpty(this.inputForm.cwWorkClientContactDTOList)) {
+				this.inputForm.filedType = '1'
+				this.contractService.save(this.inputForm).then((data) => {
 					this.loading = false
-					this.$message.error('“委托方”中至少有一条数据')
-					throw new Error('“委托方”中至少有一条数据')
-				}
-				if (this.$refs.uploadComponent.checkProgress()) {
+					callback(data.businessTable, data.businessId, this.inputForm)
+				}).catch(() => {
+					// this.$refs.inputForm.resetFields()
 					this.loading = false
-					throw new Error()
-				} else {
-					this.$refs['inputForm'].validate((valid) => {
-						if (valid) {
-							this.loading = true
-							this.inputForm.filedType = '0'
-							this.inputForm.workAttachmentList = this.$refs.uploadComponent.getDataList()
-							if (this.commonJS.isEmpty(this.inputForm.workAttachmentList)) {
-								// 附件至少上传一条
-								this.$message.error('至少上传一个附件信息')
-								this.loading = false
-								throw new Error('至少上传一个附件信息')
-							}
-							// this.inputForm.fees = this.inputForm.contractFees.join(',')
-							this.contractService.save(this.inputForm).then((data) => {
-								this.$refs.inputForm.resetFields()
-								this.loading = false
-								this.close()
-								this.$emit('refreshDataList')
-							}).catch(() => {
-								this.$refs.inputForm.resetFields()
-								this.loading = false
-							})
-						} else {
-							this.loading = false
-						}
-					})
-				}
+
+				})
 			},
 			startForm (callback) {
 				this.loading = true
@@ -1039,7 +1019,11 @@
 						console.log('3',this.inputForm)
 						this.contractService.save(this.inputForm).then((data) => {
 							this.inputForm.id = data.businessId
-							callback(data.businessTable, data.businessId, this.inputForm)
+							this.contractService.findContractById(this.inputForm.id).then((da)=>{
+								console.log('da',da)
+								this.inputForm.title= da.createName + '发起了编号' + da.no + '名称为' + da.contractName + '的[嘉溢-合同登记]'
+								callback(data.businessTable, data.businessId, this.inputForm)
+							})
 							this.loading = false
 						}).catch(() => {
 							this.loading = false
@@ -1074,7 +1058,7 @@
 							} else {
 								this.loading = true
 								this.inputForm.workAttachmentList = this.$refs.uploadComponent.getDataList()
-								if (this.$store.state.user.office.name ==='办公室'){
+								if (this.isShow){
 									if (this.commonJS.isEmpty(this.inputForm.filedNo)) {
 										this.loading = false
 										this.$message.error('请输入盒号')
@@ -1152,6 +1136,22 @@
 					}
 				}
 			},
+			checkIsBgs(){
+				let loginUserId = this.$store.state.user.id
+				userService.queryById(loginUserId).then((data)=>{
+					console.log('bgs',data.postNameList[0])
+					if (this.commonJS.isNotEmpty(data.postNameList)){
+						if (data.postNameList[0] === '办公室(嘉溢)'){
+							this.isShow=true
+						}else {
+							this.isShow=false
+						}
+					}else {
+						this.isShow=false
+					}
+				})
+
+			}
 
 		}
 	}

src/views/materialManagement/userSeal/SignetAddForm.vue

@@ -247,6 +247,9 @@
 							if (this.commonJS.isEmpty(this.inputForm.createDate)) {
 								this.inputForm.createDate = this.moment(new Date()).format('YYYY-MM-DD')
 							}
+							if (this.status === 'audit' || this.status === 'taskFormDetail') {
+								method = 'view'
+							}
 							this.$refs.uploadComponent.newUpload(method, this.inputForm.files, 'jySeal',null, null, null, null, false)
 						})
 						this.loading = false
@@ -317,11 +320,6 @@
 					// 暂存
 					this.loading = true
 					this.inputForm.status = '1'
-					this.inputForm.files = this.$refs.uploadComponent.getDataList()
-					if (this.commonJS.isEmpty(this.inputForm.types)) {
-						this.$message.error('请选择用印类型')
-						this.loading = false
-					}
 					this.signetService.saveForm(this.inputForm).then((data) => {
 						callback(data.businessTable, data.businessId, this.inputForm)
 						this.loading = false
@@ -401,7 +399,7 @@
 			insertEvent(type) {
 				if (type === 'base') {
 					if (this.inputForm.projectList.length>=1){
-						if (this.commonJS.isEmpty(this.inputForm.projectList[0].projectId)){
+						if (this.commonJS.isEmpty(this.inputForm.projectList[0].id)){
 							this.$message.error('第一行不能为空')
 							return
 						}