Merge pull request 'master' (#386) from master into prod

Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/386

src/api/project-manage/index.js

@@ -145,3 +145,10 @@ export const getPreProcess= () => {
     method: "get"
   });
 };
+export const updateLedger = (data) => {
+  return request({
+    url: '/workflow/mosr/expense/ledger/replenishment',
+    method: "post",
+    data: data
+  });
+};

src/layout/navbar/index.vue

@@ -97,7 +97,7 @@ const handleVisitedP = () => {
       ElNotification({
         title: '提示',
         message: res.msg,
-        type: res.code === 1000 ? 'success' : 'error'
+        type: 'error'
       })
     }
     accountList.value = res.data

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

@@ -39,19 +39,10 @@
           <el-table-column prop="researchPersonnel" label="研发人员" width="230">
             <template #default="scope">
               <el-form-item prop="researchPersonnel">
-                {{ chooseUserInfo() }}
+                {{ scope.row.researchPersonnelName ? scope.row.researchPersonnelName : currentReachPerson.name }}
-                <el-button @click="showPersonnelPicker">
+                <el-button @click="showPersonnelPicker(scope.row,scope.$index)">
-                  {{ chooseUserInfo() == null ? '请选择研发人员' : '更改' }}
+                  {{ scope.row.researchPersonnelName || currentReachPerson.name ? '更改' : '请选择研发人员' }}
                 </el-button>
-                <!--                <el-select v-model="scope.row.researchPersonnel" placeholder="请选择研发人员" clearable>-->
-                <!--                  <el-option-->
-                <!--                      v-for="item in researchOptions"-->
-                <!--                      :key="item.value"-->
-                <!--                      :label="item.label"-->
-                <!--                      :value="item.value"-->
-                <!--                  >-->
-                <!--                  </el-option>-->
-                <!--                </el-select>-->
               </el-form-item>
             </template>
           </el-table-column>
@@ -64,7 +55,7 @@
           </el-table-column>
           <el-table-column prop="performance" label="绩效" width="175">
             <template #default="scope">
-              <el-form-item prop="time" :rules="scope.row.performance?'1':rules.performance">
+              <el-form-item prop="time">
                 <el-input-number v-model="scope.row.performance" placeholder="请输入绩效" :controls="false"/>
               </el-form-item>
             </template>
@@ -104,18 +95,6 @@
               </el-form-item>
             </template>
           </el-table-column>
-          <!--    <el-table-column prop="time" label="时间">-->
-          <!--      <template #default="scope">-->
-          <!--        <el-input v-model="scope.row.time" placeholder="请输入时间" clearable>-->
-          <!--        </el-input>-->
-          <!--      </template>-->
-          <!--    </el-table-column>-->
-          <!--      <el-table-column prop="subtotal" label="小计">-->
-          <!--        <template #default="scope">-->
-          <!--          <el-input v-model="scope.row.subtotal" placeholder="请输入小计" clearable>-->
-          <!--          </el-input>-->
-          <!--        </template>-->
-          <!--      </el-table-column>-->
           <el-table-column prop="oper" label="操作">
             <template #default="scope">
               <el-button type="primary" @click="handleCopy(scope.row)" link style="font-size: 18px">复制</el-button>
@@ -125,7 +104,8 @@
         </el-table>
       </el-row>
     </el-form>
-    <user-picker :multiple="true" ref="userPicker" title="请选择研发人员" v-model:value="userList" @ok="selected"/>
+    <user-picker :multiple="false" ref="userPicker" title="请选择研发人员" v-model:value="userList" @ok="selected"
+                 :setNullToSelectList="true"/>
 
     <div style="width:100%;text-align: center;padding: 10px">
       <el-button type="primary" @click="handleAdd" link style="font-size: 18px">添加一行</el-button>
@@ -220,22 +200,26 @@ const formData = ref({
 })
 const userPicker = ref()
 const form = ref()
+const currentReachPerson = ref({})
+const currentRow = ref()
+const currentIndex = ref()
 const nameOptions = ref([])
 const researchOptions = ref([])
-const showPersonnelPicker = () => {
+const showPersonnelPicker = (row, index) => {
+  currentRow.value = row
+  currentIndex.value = index
   userPicker.value.showUserPicker()
 }
-const chooseUserInfo = () => {
-  if (userList.value.length > 0) {
-    return userList.value.map(item => {
-      return item.name
-    }).join('，')
-  } else {
-    return null
-  }
-}
 const selected = (select) => {
-  userList.value = select
+  for (const selectElement of select) {
+    currentReachPerson.value = selectElement
+  }
+  formData.value.tableData.forEach((item, index) => {
+    if (index == currentIndex.value) {
+      item.researchPersonnel = currentReachPerson.value.id
+      item.researchPersonnelName = currentReachPerson.value.name
+    }
+  })
 }
 const getResearchOptions = async () => {
   const res = await getResearchUser()
@@ -288,17 +272,20 @@ const handleDelete = (index) => {
   formData.value.tableData.splice(index, 1)
 }
 const handleSubmit = (instance) => {
-  // if (!instance) return
+  if (!instance) return
-  // instance.validate(async (valid) => {
+  instance.validate(async (valid) => {
-  //   if (!valid) {
+    if (!valid) {
-  //     return ElNotification({
+      return ElNotification({
-  //       title: '提示',
+        title: '提示',
-  //       message: '请完善数据,再提交!',
+        message: '请完善数据,再提交!',
-  //       type: 'error'
+        type: 'error'
-  //     })
+      })
-  //   }
+    }
     formData.value.tableData.forEach(item => {
       item.projectName = getProjectName(item.projectId)
+      if (item.performance == 0) {
+        item.performance = null
+      }
     })
     let params = {
       shareName: formData.value.shareName,
@@ -306,20 +293,20 @@ 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)
+    const {code, msg} = await addAllocation(params)
-    // ElNotification({
+    ElNotification({
-    //   title: '提示',
+      title: '提示',
-    //   message: msg,
+      message: msg,
-    //   type: code === 1000 ? 'success' : 'error'
+      type: code === 1000 ? 'success' : 'error'
-    // })
+    })
-    // if (code === 1000) {
+    if (code === 1000) {
-    //   tagsViewStore.delVisitedViews(router.currentRoute.value.path)
+      tagsViewStore.delVisitedViews(router.currentRoute.value.path)
-    //   router.push({
+      router.push({
-    //     name: 'Expense/share'
+        name: 'Expense/share'
-    //   })
+      })
-    // }
+    }
-  // })
+  })
 }
 const handleResubmit = (instance) => {
   if (!instance) return
@@ -334,6 +321,9 @@ const handleResubmit = (instance) => {
     formData.value.tableData.forEach(item => {
       item.allocationId = formData.value.allocationId
       item.projectName = getProjectName(item.projectId)
+      if (item.performance == 0) {
+        item.performance = null
+      }
     })
     let params = {
       allocationId: formData.value.allocationId,
@@ -342,7 +332,7 @@ const handleResubmit = (instance) => {
       usrAllocations: formData.value.tableData,
       deploymentId: processInstanceData.value.deploymentId,
     }
-    // console.log('params',params)
+    console.log('params', params)
     const {code, msg} = await editAllocation(params)
     ElNotification({
       title: '提示',

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

@@ -36,6 +36,10 @@ const schema = computed(() => {
   ]
 })
 const baseForm = ref()
+const tableIns = ref()
+const btns=ref([
+  {name: '表格更新', key: 'update', color: '#DED0B2', auth: ''}
+])
 const searchConfig = reactive([
   {
     label: '时间',
@@ -146,17 +150,25 @@ const tableConfig = reactive({
       currentRender: ({row}) => {
         return <span>{toThousands(row.afterTax)}</span>
       }
-    }
+    },
   ],
   api: '/workflow/mosr/expense/ledger',
   params: {
     projectId: route.query.id
   },
-  btns: [
+  btns: btns.value
-    {name: '上传费用', key: 'add', color: '#DED0B2', auth: ''}
-  ]
 })
-const tableIns = ref()
+if(route.query.state!=4){
+  btns.value.push({name: '上传费用', key: 'add', color: '#DED0B2', auth: ''})
+}
+const handleUpdateTable=()=>{
+  router.push({
+    name: 'Implementation/update',
+    query: {
+      id: route.query.id
+    }
+  })
+}
 const getBaseInfo = async () => {
   try {
     const {code, data} = await getBaseInfoApi(route.query.id)
@@ -171,6 +183,9 @@ const headBtnClick = (key) => {
     case 'add':
       handleUploadFee()
       break;
+    case 'update':
+      handleUpdateTable()
+      break;
   }
 }
 const handleUploadFee = () => {

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

@@ -344,11 +344,11 @@ const handleEdit = (row) => {
   })
 }
 const handleStandingBook = (row) => {
-  localStorage.setItem('projectName', row.projectName)
   router.push({
     name: 'Implementation/account',
     query: {
-      id: row.projectId
+      id: row.projectId,
+      state:row.state
     }
   })
 }

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

@@ -0,0 +1,166 @@
+<template>
+  <baseTitle title="表格更新"></baseTitle>
+  <el-form :model="tableForm" ref="form">
+    <el-row>
+      <el-col :span="24">
+        <el-form-item prop="projectName" label="项目名称">
+          <span>{{ tableForm.projectName }}</span>
+        </el-form-item>
+      </el-col>
+      <el-col :span="24">
+        <el-form-item prop="projectChargePerson" label="项目负责人">
+          {{currentPerson.name}}
+          <el-button @click="showPersonnelPicker">
+            {{ currentPerson.name ? '更改' : '请选择研发人员' }}
+          </el-button>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item prop="startTime" label="项目开始时间">
+          <el-date-picker
+              v-model="tableForm.startTime"
+              type="date"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
+              placeholder="选择项目开始时间"
+          >
+          </el-date-picker>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item prop="endTime" label="项目预计持续时间" :title="!tableForm.startTime?'请先选择项目开始时间!':''">
+          <el-date-picker
+              v-model="tableForm.endTime"
+              type="date"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
+              placeholder="选择项目预计持续时间"
+              :disabled="!tableForm.startTime"
+              :disabled-date="disabledDate"
+          >
+          </el-date-picker>
+        </el-form-item>
+      </el-col>
+      <el-col :span="24">
+        <el-form-item prop="projectDevelopmentWay" label="项目开展方式" style="width: 100%">
+          <el-input v-model="tableForm.projectDevelopmentWay" placeholder="请输入项目开展方式" clearable>
+          </el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="24">
+        <el-form-item prop="projectBudgetDescription" label="项目预算" style="width: 100%">
+          <el-input v-model="tableForm.projectBudgetDescription" placeholder="请输入项目预算" clearable>
+          </el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="6">
+        <el-form-item prop="projectCompletionRate" label="项目总体完成率">
+          <el-input v-model="tableForm.projectCompletionRate" placeholder="请输入项目总体完成率" clearable>
+          </el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="16" :offset="1">
+        <el-form-item prop="completeWork" label="已完成工作量">
+          <el-input v-model="tableForm.completeWork" placeholder="请输入已完成工作量" clearable>
+          </el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
+  </el-form>
+  <user-picker :multiple="false" ref="userPicker" title="请选择项目负责人" @ok="selected"/>
+  <div class="oper-page-btn">
+    <el-button color="#DED0B2" @click="handleSubmit">提交</el-button>
+    <el-button @click="handleBack">返回</el-button>
+  </div>
+</template>
+
+<script setup lang="jsx">
+import {ElMessage, ElNotification} from "element-plus";
+import {updateLedger} from "@/api/project-manage";
+import {getBaseInfoApi} from "@/components/steps/api";
+import {ref} from "vue";
+import UserPicker from "@/views/workflow/process/common/UserPicker.vue";
+
+import {useTagsView} from '@/stores/tagsview.js'
+
+const tagsViewStore = useTagsView()
+const baseForm = ref()
+const route = useRoute()
+const router = useRouter()
+const currentPerson = ref({})
+const tableForm = ref({
+  projectName: '',
+  completeWork: '',
+  endTime: '',
+  projectBudgetDescription: '',
+  projectChargePerson: '',
+  projectCompletionRate: '',
+  projectDevelopmentWay: '',
+  projectId: '',
+  startTime: '',
+})
+const userPicker = ref()
+const selected = (select) => {
+  for (const selectElement of select) {
+    currentPerson.value = selectElement
+    tableForm.value.projectChargePerson=selectElement.id
+  }
+}
+const disabledDate = (time) => {
+  return time.getTime() < new Date(tableForm.value.startTime).getTime();
+}
+const handleBack = () => {
+  history.back()
+}
+const showPersonnelPicker = () => {
+  userPicker.value.showUserPicker()
+}
+const handleSubmit = async () => {
+  console.log('tableForm', tableForm.value)
+  let params={
+    ...tableForm.value,
+    projectId:route.query.id
+  }
+  // tableForm.value={
+  //   "projectName": "测试上报622",
+  //   "completeWork": "已完成系统性需求调研、核心业务流程梳理以及研发计划的制定。",
+  //   "endTime": "2024-06-26",
+  //   "projectBudgetDescription": "本项目总研发投入预算为xx万元，其中支付给外部专业机构的合作研发费用预计为xx万元。（示例）",
+  //   "projectChargePerson": 161,
+  //   "projectCompletionRate": "40",
+  //   "projectDevelopmentWay": "项目采用合作研发模式，由省国经公司牵头，联合本领域外部专业研究机构作为合作方共同开展。",
+  //   "projectId": "",
+  //   "startTime": "2024-06-11"
+  // }
+  updateLedger(params).then(res => {
+    if (res.code === 1000) {
+      tagsViewStore.delVisitedViews(router.currentRoute.value.path)
+      router.push({
+        name: 'Implementation/account',
+        query: {
+          id: route.query.id
+        }
+      })
+    } else {
+      ElNotification({
+        title: '提示',
+        message: res.msg,
+        type: 'error'
+      })
+    }
+  })
+}
+const getBaseInfo = async () => {
+  const {code, data} = await getBaseInfoApi(route.query.id)
+  tableForm.value.projectName = data.projectName
+}
+
+getBaseInfo()
+const init = () => {
+
+}
+</script>
+
+<style scoped>
+
+</style>

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

@@ -56,8 +56,8 @@
       <el-table-column prop="afterTax" label="税后余额(元)" width="220">
         <template #default="scope">
           <el-form-item prop="afterTax" :rules="scope.row.afterTax?'1':rules.afterTax">
-            <el-input v-model="scope.row.afterTax" placeholder="请输入税后余额" clearable>
+            <el-input-number v-model="scope.row.afterTax" placeholder="请输入税后余额" :controls="false">
-            </el-input>
+            </el-input-number>
           </el-form-item>
         </template>
       </el-table-column>
@@ -127,7 +127,7 @@ const tableForm = reactive({
       projectCost: '',
       researchStage: '',
       digest: '',
-      afterTax: ''
+      afterTax: null
     }
   ]
 })
@@ -148,7 +148,7 @@ const handleAdd = () => {
     projectCost: '',
     researchStage: '',
     digest: '',
-    afterTax: ''
+    afterTax: null
   }
   tableForm.tableData.push(row)
 }

src/views/workflow/process/common/UserPicker.vue

@@ -88,6 +88,11 @@ const props = defineProps({
   showCheckbox: { //是否显示左侧选择框
     default: true,
     type: Boolean
+  },
+  //打开弹窗时是否重置选中数据
+  setNullToSelectList: {
+    default: false,
+    type: Boolean
   }
 });
 const radio = ref(0);
@@ -151,7 +156,6 @@ const getList = (flag) => {
     }
   }
   getMosrDept(params).then(res => {
-    console.log('selectItem.type', selectItem.type)
     // if (res.data) {
     if (selectItem.type === -1) {
       dataList.value = res.data;
@@ -189,7 +193,9 @@ const showUserPicker = () => {
     value: "0"
   };
   dataList.value = [];
-  // selectList.value = []
+  if(props.setNullToSelectList){
+    selectList.value = []
+  }
   chooseId.value = 0;
   radio.value = 0;
   visible.value = true;