duy 2 年 前
コミット
f77cece761
4 ファイル変更20 行追加23 行削除
  1. 1 1
      package.json
  2. 1 1
      public/version.json
  3. 8 16
      src/views/program/project/form.vue
  4. 10 5
      yarn.lock

+ 1 - 1
package.json

@@ -18,7 +18,7 @@
         "dayjs": "^1.11.9",
         "echarts": "^5.4.2",
         "element-plus": "2.3.8",
-        "hc-vue3-ui": "^1.6.5",
+        "hc-vue3-ui": "^1.7.1",
         "js-base64": "^3.7.5",
         "js-cookie": "^3.0.5",
         "js-fast-way": "^0.2.1",

+ 1 - 1
public/version.json

@@ -1,3 +1,3 @@
 {
-  "value": "20230718094438"
+  "value": "20230720182348"
 }

+ 8 - 16
src/views/program/project/form.vue

@@ -345,7 +345,7 @@ import { useRoute, useRouter } from 'vue-router'
 import { onActivated, ref, watch } from 'vue'
 import projectApi from '~api/program/project.js'
 import contractApi from '~api/project/project-contract.js'
-import { getArrValue, getObjValue } from 'js-fast-way'
+import { deepClone, getArrValue, getObjValue } from 'js-fast-way'
 import { getTaskType, getuserList } from '~api/other'
 import { useAppStore } from '~src/store'
 const useAppState = useAppStore()
@@ -537,10 +537,10 @@ const subbetweenTimeUpdate = ({ arr }, item) => {
 const subplanModal = ref(false)
 const subPlanItem = ref({})
 const subplanModalShow = (row) => {
-    console.log(row, 'row')
-    subPlanItem.value = row
+    const rows = deepClone(row)
+    subPlanItem.value = rows
     subplanModal.value = true
-    tableSubplanData.value = row?.childrenList || []
+    tableSubplanData.value = getArrValue(rows?.childrenList)
 
 }
 //表格
@@ -560,17 +560,7 @@ const tableSubplanData = ref([
 ])
 
 const subplanCloseClick = () => {
-    const arr = tableSubplanData.value
-    for (let i = arr.length - 1; i >= 0; i--) {
-        if (!arr[i].planTaskType || !arr[i].planTaskDesc || !arr[i].planTarget || !arr[i].planStartTime || !arr[i].planEndTime || !arr[i].planDays) {
-            arr.splice(i, 1)
-        }
-    }
-    // tableSubplanData.value = tableSubplanData.value.filter((item)=>Number(item?.planDays) < 30)
-    // subPlanItem.value.childrenList = tableSubplanData.value.filter((item)=>Number(item?.planDays) < 30)
     subplanModal.value = false
-
-    
 }
 
 const addplan = ()=>{
@@ -578,7 +568,7 @@ const addplan = ()=>{
         projectProcessValue:subPlanItem.value?.projectProcessValue,
         budgetTypeValue:subPlanItem.value?.budgetTypeValue,
         taskDetailValue:subPlanItem.value?.taskDetailValue,
-        planTaskType:subPlanItem.value?.planTaskType,
+        planTaskTypeValue:subPlanItem.value?.planTaskTypeValue,
         isEdit:false,
 
 
@@ -614,6 +604,9 @@ const getWorkDays = async (row)=>{
             })
             if (!error && code === 200) {
                     row.planDays = data
+            } else {
+                row.planStartTime = ''
+                row.planEndTime = ''
             }
         }
     
@@ -654,7 +647,6 @@ const updateMainPlanClick = async (row)=>{
 const updateChildPlanLoading = ref(false)
 //编辑子计划传入父级
 const updateChildPlanClick = async ()=>{
-    // subPlanItem.value.childrenList = tableSubplanData.value
     updateChildPlanLoading.value = true
     const { error, code, data, msg } = await projectApi.updateChildrenPlan( 
         subPlanItem.value,

+ 10 - 5
yarn.lock

@@ -1131,15 +1131,15 @@ has@^1.0.3:
   dependencies:
     function-bind "^1.1.1"
 
-hc-vue3-ui@^1.6.5:
-  version "1.6.5"
-  resolved "http://47.110.251.215:9000/hc-vue3-ui/-/hc-vue3-ui-1.6.5.tgz#f3c79ec3b42d89461e44b49daacd5fa7a1c9b5d7"
-  integrity sha512-/KYMvR1fv/Kq4OJCBJv2sZf75ldCdCjSDxVLtziYayo19FSfDRVHJ/nZVFsnJqCtv94GFLSp2/FixnuARYSa3w==
+hc-vue3-ui@^1.7.1:
+  version "1.7.1"
+  resolved "http://47.110.251.215:9000/hc-vue3-ui/-/hc-vue3-ui-1.7.1.tgz#5228f5fbb3f0356156bc585a71aea7544076d3ea"
+  integrity sha512-0pg/sH3DHTOsseosMjETLJh5cmte1Vg1Lad7o8gxGiCL3k8fZF3SBMgdjDC8DArkT2+rdCxpXvcfiA+CBL13zA==
   dependencies:
     axios "^1.4.0"
     dayjs "^1.11.9"
     element-plus "2.3.8"
-    js-fast-way "^0.2.1"
+    js-fast-way "^0.2.4"
     js-md5 "^0.7.3"
     simple-uploader.js "^0.6.0"
     sortablejs "^1.15.0"
@@ -1253,6 +1253,11 @@ js-fast-way@^0.2.1:
   resolved "http://47.110.251.215:9000/js-fast-way/-/js-fast-way-0.2.1.tgz#ca099b8fdc304739dd65583d0eb9fa09052eaec0"
   integrity sha512-QYLYuavyDb/0V5YSSNynAvkm2EcbWPJxxi+frXiL1gKO6y827Z1Z/zJl1WgeRZiVNQCWlsZT7OKZDDWC+Mw2xQ==
 
+js-fast-way@^0.2.4:
+  version "0.2.4"
+  resolved "http://47.110.251.215:9000/js-fast-way/-/js-fast-way-0.2.4.tgz#3be409949f7dc02a9c1e5f33cb13844f32c3aa5a"
+  integrity sha512-hxK779cCMBttfSJ1ocJbyg3vPxX2trlpRf373kIQJ1Zrpa2o/nuZeb3D2P59/WYQxHIQ8e3B/8/9aNEu+aXW5g==
+
 js-md5@^0.7.3:
   version "0.7.3"
   resolved "http://47.110.251.215:9000/js-md5/-/js-md5-0.7.3.tgz#b4f2fbb0b327455f598d6727e38ec272cd09c3f2"