Merge branch 'master' of http://git.feashow.cn/clay/mosr-web

src/views/expense-management/share/add.vue

@@ -40,7 +40,7 @@
             <template #default="scope">
               <el-form-item prop="researchPersonnelId">
                 {{ scope.row.researchPersonnel }}
-                <el-button @click="showPersonnelPicker(scope.row,scope.$index)">
+                <el-button color="#DED0B2"  @click="showPersonnelPicker(scope.row,scope.$index)" style="margin-left: 10px">
                   {{ scope.row.researchPersonnel ? '更改' : '请选择研发人员' }}
                 </el-button>
               </el-form-item>
@@ -115,7 +115,7 @@
         <baseTitle title="审批记录" v-if="processDiagramViewer&& opentionData?.operationList"></baseTitle>
         <div v-else></div>
         <div style="display: flex;align-items: center;justify-content: flex-start;">
-          <div class="base-title" style="margin-left: 10px">流程图</div>
+          <div class="base-title" style="margin-left: 10px;margin-right: 10px">流程图</div>
           <el-switch
               v-model="changeDiagram"
               style="--el-switch-on-color:#BEA266 ; --el-switch-off-color:#cecdcd"
@@ -214,13 +214,14 @@ const showPersonnelPicker = (row, index) => {
       accountType: row.accountType,
     }
     userList.value=[userObj]
+  }else if(!row.researchPersonnel){
+    userList.value=[]
   }
   nextTick(() => {
     userPicker.value.showUserPicker()
   })
 }
 const selected = (select) => {
-  console.log('select',select)
   if (!select || select.length === 0) {
     return
   }
@@ -232,7 +233,7 @@ const selected = (select) => {
       item.accountType = select[0].accountType
     }
   })
-  // userList.value=select
+  userList.value=select
 }
 const getResearchOptions = async () => {
   const res = await getResearchUser()
@@ -272,6 +273,8 @@ const handleCopy = (row) => {
   let copyObj = {
     projectId: row.projectId,
     projectName: '',
+    accountType: row.accountType,
+    companyName: row.companyName,
     researchPersonnelId: row.researchPersonnelId,
     researchPersonnel: row.researchPersonnel,
     wagesPayable: row.wagesPayable,
@@ -320,7 +323,7 @@ const handleSubmit = (instance) => {
       usrAllocations: formData.value.tableData,
       deploymentId: processInstanceData.value.deploymentId,
     }
-    console.log('params', params, formData.value.tableData)
+    // console.log('params', params, formData.value.tableData)
     const {code, msg} = await addAllocation(params)
     ElNotification({
       title: '提示',
@@ -346,8 +349,6 @@ const handleResubmit = (instance) => {
       })
       return;
     }
-    let newUsrAllocationsObj = {}
-    let newUsrAllocationsObjArray = []
     let researchPersonnelId = ''
     formData.value.tableData.forEach(item => {
       item.allocationId = formData.value.allocationId
@@ -356,24 +357,6 @@ const handleResubmit = (instance) => {
       if (item.performance == 0) {
         item.performance = null
       }
-      newUsrAllocationsObj = {
-        allocationId: formData.value.allocationId,
-        id: item.id,
-        projectId: item.projectId,
-        projectName: item.projectName,
-        researchPersonnel: item.researchPersonnel,
-        researchPersonnelId: item.researchPersonnelId,
-        wagesPayable: item.wagesPayable,
-        performance: item.performance,
-        reserveFund: item.reserveFund,
-        socialSecurity: item.socialSecurity,
-        time: item.time,
-        subtotal: item.subtotal,
-        annuity: item.annuity,
-        workday: item.workday,
-        researchDuration: item.researchDuration,
-      }
-      newUsrAllocationsObjArray.push(newUsrAllocationsObj)
     })
     if (!researchPersonnelId) {
       ElNotification({
@@ -383,15 +366,14 @@ const handleResubmit = (instance) => {
       })
       return;
     }
-    console.log('formData.value.apportionmentMonth',new Date(formData.value.apportionmentMonth))
     let params = {
       allocationId: formData.value.allocationId,
       shareName: formData.value.shareName,
       apportionmentMonth: formData.value.apportionmentMonth,
-      usrAllocations:newUsrAllocationsObjArray,
+      usrAllocations:formData.value.tableData,
       deploymentId: processInstanceData.value.deploymentId,
     }
-    console.log('params', params, formData.value.tableData)
+    // console.log('params', params, formData.value.tableData)
     const {code, msg} = await editAllocation(params)
     ElNotification({
       title: '提示',

src/views/project-demand/requirement/add.vue

@@ -104,7 +104,7 @@
       <el-button color="#DED0B2" v-else @click="handleResubmit">重新提交</el-button>
       <el-button @click="handleBack">返回</el-button>
     </div>
-    <company-picker :multiple="true" ref="companyRef" title="请选择所属公司" @ok="selected"
+    <company-picker :multiple="true" ref="companyRef" title="请选择征集公司" @ok="selected"
                     v-model:value="selectedCompanyList"/>
   </div>
 </template>
@@ -168,7 +168,7 @@ const formPermMap = ref(new Map());
 const companyNameArray = ref([])
 const rules = reactive({
   requirementName: [{required: true, message: '请输入征集名称', trigger: 'blur'}],
-  companyIds: [{required: true, message: '请选择所属公司', trigger: 'blur'}],
+  companyIds: [{required: true, message: '请选择征集公司', trigger: 'blur'}],
   collectType: [{required: true, message: '请选择征集类型', trigger: 'blur'}],
   deadline: [{required: true, message: '请选择截止时间', trigger: 'blur'}],
   specialFundId: [{required: true, message: '请选择专项资金名称', trigger: 'blur'}],
@@ -341,7 +341,7 @@ const submitParam = (item) => {
   if (item.companyIds.length === 0) {
     ElNotification({
       title: '提示',
-      message: '请选择所属公司',
+      message: '请选择征集公司',
       type: 'error'
     })
     return;

src/views/project-management/implementation/updateTable.vue

@@ -10,7 +10,7 @@
       <el-col :span="24">
         <el-form-item prop="projectChargePerson" label="项目负责人">
           {{ tableForm.projectChargePersonName }}
-          <el-button color="#DED0B2" @click="showPersonnelPicker">
+          <el-button color="#DED0B2" @click="showPersonnelPicker" style="margin-left: 10px">
             {{ tableForm.projectChargePersonName ? '更改' : '请选择项目负责人' }}
           </el-button>
         </el-form-item>

src/views/system/config/index.vue

@@ -18,14 +18,13 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" @click="getList" :icon="Search">搜索</el-button>
+        <el-button color="#DED0B2" @click="getList" :icon="Search">搜索</el-button>
         <el-button @click="handleReset" :icon="Refresh">重置</el-button>
       </el-form-item>
     </el-form>
     <div class="query-btn">
-      <el-button type="primary" v-perm="['admin:config:add']" @click="handleAdd" :icon="Plus" plain>新增</el-button>
+      <el-button color="#DED0B2" v-perm="['admin:config:add']" @click="handleAdd" >新增</el-button>
       <el-button type="danger" v-perm="['admin:config:del']" @click="handleMoreDelete(configIds,configNameList)"
-                 :icon="Delete" plain
                  :disabled="disabled">删除
       </el-button>
 <!--      <el-button type="warning" v-perm="['admin:config:export']" @click="handleExport" :icon="Download" plain>导出-->

src/views/system/department/index.vue

@@ -10,12 +10,12 @@
       <el-input v-model="queryParams.departmentName" placeholder="请输入部门名称" clearable></el-input>
     </el-form-item>
     <el-form-item>
-      <el-button type="primary" @click="getList" :icon="Search">搜索</el-button>
+      <el-button color="#DED0B2" @click="getList" :icon="Search">搜索</el-button>
-      <el-button type="primary" @click="handleReset(queryInstance)" :icon="Refresh">重置</el-button>
+      <el-button @click="handleReset(queryInstance)" :icon="Refresh">重置</el-button>
     </el-form-item>
   </el-form>
   <div class="table-header-btn">
-    <el-button type="info" @click="handleExpand" :icon="Sort">{{ isExpand ? '全部收起' : '全部展开' }}</el-button>
+    <el-button color="#DED0B2" @click="handleExpand" :icon="Sort">{{ isExpand ? '全部收起' : '全部展开' }}</el-button>
   </div>
   <el-table
       :data="list"

src/views/system/menu/index.vue

@@ -11,13 +11,13 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" @click="getList">搜索</el-button>
+        <el-button color="#DED0B2" @click="getList">搜索</el-button>
-        <el-button type="primary" @click="handleReset(queryInstance)">重置</el-button>
+        <el-button @click="handleReset(queryInstance)">重置</el-button>
       </el-form-item>
     </el-form>
     <div class="table-header-btn">
-      <el-button type="primary" @click="handleAdd" :icon="Plus" v-perm="['admin:menu:add']">新增</el-button>
+      <el-button color="#DED0B2" @click="handleAdd" v-perm="['admin:menu:add']">新增</el-button>
-      <el-button type="info" @click="handleExpand" :icon="Sort">{{ isExpand ? '全部收起' : '全部展开' }}</el-button>
+      <el-button type="" color="#DED0B2" @click="handleExpand" :icon="Sort">{{ isExpand ? '全部收起' : '全部展开' }}</el-button>
     </div>
 
     <el-table :data="list" ref="tableTree" :default-expand-all="isExpand"

src/views/system/role/add.vue

@@ -27,8 +27,8 @@
       />
     </div>
     <div class="oper-page-btn">
-      <el-button type="primary" @click="handleSubmit">提交</el-button>
+      <el-button color="#DED0B2" @click="handleSubmit">提交</el-button>
-      <el-button type="primary" @click="handleBack">返回</el-button>
+      <el-button  @click="handleBack">返回</el-button>
     </div>
   </div>
 </template>

src/views/system/role/index.vue

@@ -186,7 +186,7 @@ const tableConfig = reactive({
     }
   ],
   api: '/admin/role',
-  btns: [{name: '新增', key: 'add', auth: auths.add, type: 'primary'}],
+  btns: [{name: '新增', key: 'add', auth: auths.add, color:"#DED0B2"}],
   params: {}
 })
 

src/views/system/subsidiary/index.vue

@@ -10,12 +10,12 @@
       <el-input v-model="queryParams.companyName" placeholder="请输入子公司简称" clearable></el-input>
     </el-form-item>
     <el-form-item>
-      <el-button type="primary" @click="getList" :icon="Search">搜索</el-button>
+      <el-button color="#DED0B2" @click="getList" :icon="Search">搜索</el-button>
-      <el-button type="primary" @click="handleReset(queryInstance)" :icon="Refresh">重置</el-button>
+      <el-button  @click="handleReset(queryInstance)" :icon="Refresh">重置</el-button>
     </el-form-item>
   </el-form>
   <div class="table-header-btn">
-    <el-button type="info" @click="handleExpand" :icon="Sort">{{ isExpand ? '全部收起' : '全部展开' }}</el-button>
+    <el-button color="#DED0B2" @click="handleExpand" :icon="Sort">{{ isExpand ? '全部收起' : '全部展开' }}</el-button>
   </div>
   <el-table
       :data="list"

src/views/system/user/add.vue

@@ -3,8 +3,8 @@
     <baseTitle :title="'用户信息录入'"></baseTitle>
     <fvForm :schema="schame" @getInstance="getInstance" :rules="rules"></fvForm>
     <div class="oper-page-btn">
-      <el-button type="primary" @click="handleSubmit">提交</el-button>
+      <el-button color="#DED0B2" @click="handleSubmit">提交</el-button>
-      <el-button type="primary" @click="handleBack">返回</el-button>
+      <el-button  @click="handleBack">返回</el-button>
     </div>
   </div>
 </template>
@@ -246,4 +246,4 @@ onMounted(async ()=>{
 
 <style lang="scss" scoped>
 
-</style>
+</style>

src/views/system/user/index.vue

@@ -167,7 +167,7 @@ const tableConfig = reactive({
   api: '/admin/mosr/user',
   params: {},
   btns: [
-    {name: '新增', type: 'primary', auth: ['admin:user:add'], key: 'add'}
+    {name: '新增', color:"#DED0B2", auth: ['admin:user:add'], key: 'add'}
   ]
 })
 

src/views/tool/dict/index.vue

@@ -3,13 +3,13 @@
     <div class="layout">
       <div class="layout-left">
         <div class="query-btn">
-          <el-button type="primary" v-perm="['dict:type:add']" @click="handleAddType" :icon="Plus" plain>新增</el-button>
+          <el-button color="#DED0B2" v-perm="['dict:type:add']" @click="handleAddType" plain >新增</el-button>
           <!--        <el-button type="warning" v-perm="['dict:type:export']" @click="handleExport" :icon="Download" plain>导出-->
           <!--        </el-button>-->
-          <el-button type="primary" :icon="Edit" v-perm="['dict:type:edit']"
+          <el-button type="primary"  v-perm="['dict:type:edit']"
                      @click.stop="handleEditType" plain>修改
           </el-button>
-          <el-button type="danger" :icon="Delete" v-perm="['dict:type:del']"
+          <el-button type="danger"  v-perm="['dict:type:del']"
                      @click.stop="handleDeleteType" :disabled="disabledDelete" plain>删除
           </el-button>
         </div>
@@ -40,7 +40,7 @@
       </div>
       <div class="layout-right" style="margin-top: 15px;">
         <div class="query-btn">
-          <el-button type="primary" v-perm="['dict:data:add']" @click="handleAddData" :icon="Plus" plain>新增</el-button>
+          <el-button type="primary" v-perm="['dict:data:add']" @click="handleAddData" plain>新增</el-button>
         </div>
         <el-form :model="queryData">
           <el-form-item prop="dictLabel">

src/views/workflow/process/ProcessDesign.vue

@@ -1,14 +1,14 @@
 <template>
   <div class="scale">
-    <el-button icon="Plus" size="mini" @click.stop="scale += 10" :disabled="scale >= 150" circle></el-button>
-    <span>{{ scale }}%</span>
     <el-button icon="Minus" size="mini" @click.stop="scale -= 10" :disabled="scale <= 40" circle></el-button>
+    <span>{{ scale }}%</span>
+    <el-button icon="Plus" size="mini" @click.stop="scale += 10" :disabled="scale >= 150" circle></el-button>
   </div>
-    <div :style="'transform: scale('+ scale / 100 +');'">
+  <div :style="'transform: scale('+ scale / 100 +');margin-top: 100px;'">
-      <div id="processTree">
+    <div id="processTree">
-        <process-tree ref="processTree" mode="design" id-name="processTree" @selectedNode="nodeSelected"/>
+      <process-tree ref="processTree" mode="design" id-name="processTree" @selectedNode="nodeSelected"/>
-      </div>
     </div>
+  </div>
 
 
   <el-drawer :title="selectedNode.name" v-model="showConfig"

src/views/workflow/process/ProcessSetting.vue

@@ -1,7 +1,7 @@
 <template>
   <div v-if="processData.processDefinitionKey">
-    <p>
+    <p style="margin-top: 10px">
-      流程名称: {{ processData.deploymentName }}
+      流程名称 : {{ processData.deploymentName }}
     </p>
   </div>
   <div v-if="!processData.processDefinitionKey">
@@ -31,7 +31,9 @@ const processData = computed(() => {
 const validate = () => {
   return []
 }
-
+onActivated(()=>{
+  init()
+})
 const init = () => {
   getTypeOption().then(res => {
     optionList.value = res.data

src/views/workflow/process/config/ApprovalNodeConfig.vue

@@ -4,12 +4,18 @@
       <el-radio-group v-model="nodeProps.assignedType">
         <el-radio v-for="item in approvalTypes" :label="item.type" :key="item.type">{{ item.name }}</el-radio>
       </el-radio-group>
-      <div v-if="nodeProps.assignedType === 'ASSIGN_USER'">
+
+<!--      <div v-else>-->
+<!--        <span class="item-desc">发起人自己作为审批人进行审批</span>-->
+<!--      </div>-->
+    </el-form-item>
+    <el-form-item style="margin-top: -18px">
+      <div v-if="nodeProps.assignedType === 'ASSIGN_USER'" >
         <el-button size="mini" icon="Plus" type="primary" @click="showSysRolePicker" round>
           选择人员
         </el-button>
         <user-picker :check-matrix="true" title="请选择人员" :multiple="false" ref="sysRolePicker" :v-model="assignedUser" @ok="selectedUser"/>
-<!--        <ellipsis :row="3" :user-info="assignedUser"/>-->
+        <!--        <ellipsis :row="3" :user-info="assignedUser"/>-->
         <role-items v-model="assignedUser"/>
       </div>
       <div v-else-if="nodeProps.assignedType === 'SELF_SELECT'">
@@ -56,9 +62,6 @@
           </el-select>
         </el-form-item>
       </div>
-<!--      <div v-else>-->
-<!--        <span class="item-desc">发起人自己作为审批人进行审批</span>-->
-<!--      </div>-->
     </el-form-item>
 <!--    <el-divider></el-divider>-->
 <!--    <el-form-item label="审批人为空时" prop="text" class="line-mode">-->

src/views/workflow/process/index.vue

@@ -15,9 +15,9 @@
       <!--      </el-select>-->
       <!--    </el-form-item>-->
       <el-form-item>
-        <el-button type="primary" @click="getList" :icon="Search">搜索</el-button>
+        <el-button color="#DED0B2" @click="getList" :icon="Refresh">搜索</el-button>
-        <el-button type="primary"  @click="handleAdd" :icon="Plus">新增</el-button>
+        <el-button color="#DED0B2"  @click="handleAdd" :icon="Plus">新增</el-button>
-        <el-button type="primary" @click="handleReset" :icon="Refresh" plain>重置</el-button>
+        <el-button @click="handleReset" :icon="Refresh" >重置</el-button>
 <!--        <el-button type="primary"  @click="handleExport" :icon="Download" plain>导出-->
 <!--        </el-button>-->
       </el-form-item>