委托单

src/api/modules/tentative/detect/commission.js

@@ -12,7 +12,7 @@ export default {
     //委托单信息表
     async htmlSave(form, msg = true) {
         return HcApi({
-            url: '/api/blade-business/entrustinfo/save_buss_data',
+            url: '/api/blade-business/entrustinfo/save_entrust_data',
             method: 'post',
             data: form,
         }, msg)

src/api/modules/tentative/material/sampling.js

@@ -94,7 +94,7 @@ export default {
     //获取html回显
     async getBussDataInfoTrialEntrust(form, msg = true) {
         return HcApi({
-            url: '/api/blade-manager/wbsPrivate/get-buss-dataInfo-trial_entrust',
+            url: '/api/blade-manager/exceltab/get-buss-dataInfo-trial_entrust',
             method: 'get',
             params: form,
         }, msg)

src/views/data-fill/query.vue

@@ -48,6 +48,7 @@
                 <div class="dot-view black">未填报</div>
                 <div class="dot-view orange">已填报-待审批</div>
                 <div class="dot-view blue">已填报-未上报</div>
+                <div class="dot-view red">已隐藏</div>
             </div>
             <!-- 左右拖动 -->
             <div class="horizontal-drag-line" @mousedown="onmousedown" />

src/views/ledger/components/WbsTree.vue

@@ -10,12 +10,9 @@
             <div :id="`${idPrefix}${data.primaryKeyId}`" class="data-custom-tree-node">
                 <!-- 树组件，节点名称 -->
                 <div :class="node.level === 1 ? 'level-name' : ''" class="label">
-                    <span
-                        v-if="isColor"
-                        :class="data?.colorStatus === 2 ? 'text-blue' : data?.colorStatus === 3 ? 'text-orange' : data?.colorStatus === 4 ? 'text-green' : ''"
-                    >{{
-                        node.label
-                    }}</span>
+                    <span v-if="isColor" :class="data?.colorStatus === 2 ? 'text-blue' : data?.colorStatus === 3 ? 'text-orange' : data?.colorStatus === 4 ? 'text-green' : ''"
+                    >{{node.label}}
+                    </span>
                     <span v-else>{{ node.label }}</span>
                 </div>
                 <!-- 树组件，操作菜单 -->

src/views/other/hide-data.vue

@@ -30,10 +30,10 @@
                     <div v-if="isShowLeft" id="hc-tree-scrollbar" v-loading="treeLoading" class="hc-tree-scrollbar" element-loading-text="获取数据中...">
                         <el-scrollbar v-show="isSearchTree" class="scroll-bar-right-16">
                             <HcDataTree
-                             
+
                                 :datas="searchTreeData"
                                 :is-mark="TreeMark"
-                               
+
                                 is-counts
                                 is-type
                                 :auto-expand-keys="TreeAutoExpandKeys"
@@ -47,15 +47,15 @@
                                             <span v-if="(data.type > 0 && data.majorDataType > 0) || (data.type > 0 && data.majorDataType <= 0)" class="hc-tree-node-type">
                                                 {{ getTreeNodeType(data.type, data.majorDataType) }}
                                             </span>
-                                           
+
                                             <span :class="data.isBussShow === '2' ? 'text-red' : ''">
                                                 {{ node.label }}
                                             </span>
                                         </div>
                                         <!-- 树组件，统计数量 -->
                                         <div class="submit-counts text-blue">【{{ data.submitCounts ?? 0 }}】</div>
-                                    
-                                 
+
+
                                         <!-- 树组件，操作菜单 END -->
                                     </div>
                                 </template>
@@ -71,7 +71,7 @@
                                 show-checkbox
                                 check-strictly
                                 @load="treeLoadNode"
-                              
+
                                 @node-loading="ElTreeNodeLoading"
                                 @node-tap="wbsElTreeClick"
                                 @check="ElTreeNodeCheck"
@@ -83,15 +83,15 @@
                                             <span v-if="(data.type > 0 && data.majorDataType > 0) || (data.type > 0 && data.majorDataType <= 0)" class="hc-tree-node-type">
                                                 {{ getTreeNodeType(data.type, data.majorDataType) }}
                                             </span>
-                                           
+
                                             <span :class="data.isBussShow === '2' ? 'text-red' : ''">
                                                 {{ node.label }}
                                             </span>
                                         </div>
                                         <!-- 树组件，统计数量 -->
                                         <div class="submit-counts text-blue">【{{ data.submitCounts ?? 0 }}】</div>
-                                    
-                                 
+
+
                                         <!-- 树组件，操作菜单 END -->
                                     </div>
                                 </template>
@@ -407,10 +407,10 @@ const wbsElTreeClick = ({ node, data, keys }) => {
     const { notExsitChild } = data
     const { hasChildren } = data
     if (notExsitChild || !hasChildren) {
-     
+
         getTableDataAll()
     } else {
-      
+
         ListItemDatas.value = []
         NodeStatus.value = '1'
     }
@@ -601,7 +601,7 @@ const ListItemsRef = ref(null)
 
 
 
- 
+
 //划分变更
 const divisionClick = () => {
     router.push({
@@ -662,7 +662,7 @@ const showTreeNode = async ()=>{
     const { error, code, msg } = await wbsApi.updateNodeStates({
         ids: keys,
         status:1,
-        
+
     }, false)
     showTreeNodeLoad.value = false
     if (!error && code === 200) {
@@ -672,7 +672,7 @@ const showTreeNode = async ()=>{
             setTimeout(()=>{
                 isShowLeft.value = true
             }, 500)
-       
+
     } else {
         window?.$message?.error(msg)
     }
@@ -728,7 +728,7 @@ html.theme-dark {
     }
     .hc-layout-box .hc-layout-content-box .hc-card-max-h-box.node-tree .hc-tree-foot-tip-box {
         border-top: 1px solid #303030;
-       
+
     }
 
 }

src/views/tentative/detect/commission.vue

@@ -147,7 +147,7 @@
             :ids="reportIds"
             :project-id="projectId"
             :task-name="reportTaskName"
-            :trial-self-inspection-record-id="1"
+            :trial-self-inspection-record-id="2"
             title="上报审批" type="wbs"
             url="informationWriteQuery/batchTask"
             @finish="showReportFinish"
@@ -338,8 +338,10 @@ const getDelegateDataInfo = async (editId) => {
         projectId: projectId.value,
         contractId: delegateContractId.value,
     })
+
     if (!error && code === 200) {
-        delegateHtmlForm.value = getObjValue(data)
+        console.log('--------', data)
+        delegateHtmlForm.value = getObjValue(data[0])
     } else {
         delegateHtmlForm.value = {}
         window.$message.error(msg || '获取委托信息失败')
@@ -499,7 +501,7 @@ const reportClick = () => {
     const { contractType } = contractInfo.value
     classifyType.value = contractType > 0 ? contractType + '' : '1'
     //其它数据
-    reportIds.value = id //数据ID
+    reportIds.value = rows[0].id //数据ID
     reportTaskName.value = entrustName //任务名称
     //附加数据
     const { contractIdRelation } = nodeDataInfo.value

src/views/tentative/material/sampling.vue

@@ -794,6 +794,7 @@ const delegationClick = () => {
     }
     delegateModal.value = true
     editHtmlId.value = rows[0].id
+    entrustId.value = rows[0].entrustId
     const { contractId } = deepClone(searchForm.value)
     delegateContractId.value = contractId
     if (!isNullES(contractId)) {
@@ -803,10 +804,11 @@ const delegationClick = () => {
 
 //合同段被选择
 const editHtmlId = ref('')
+const entrustId = ref('')
 const delegateContractChange = async () => {
     delegateHtmlLoading.value = true
-    if (!isNullES(editHtmlId.value)) {
-        await getDelegateDataInfo(editHtmlId.value)
+    if (!isNullES(entrustId.value)) {
+        await getDelegateDataInfo(entrustId.value)
     }
     await getDelegateExcelHtml()
     delegateHtmlLoading.value = false
@@ -817,11 +819,10 @@ const getDelegateDataInfo = async (editId) => {
     const { error, code, msg, data } = await samplingApi.getBussDataInfoTrialEntrust({
         id: editId,
         pkeyId: nodeErTreeId.value,
-        projectId: projectId.value,
         contractId: delegateContractId.value,
     })
     if (!error && code === 200) {
-        delegateHtmlForm.value = getObjValue(data)
+        delegateHtmlForm.value = getObjValue(data[0])
     } else {
         delegateHtmlForm.value = {}
         window.$message.error(msg || '获取委托信息失败')
@@ -851,6 +852,7 @@ const delegateHtmlRender = (form) => {
 //创建委托
 const creatingDelegateLoading = ref(false)
 const creatingDelegate = async () => {
+    const rows = tableCheckedKeys.value
     if (isNullES(delegateHtml.value)) {
         window.$message.error('暂无委托单信息')
         return
@@ -862,6 +864,8 @@ const creatingDelegate = async () => {
     }
     form.contractId = delegateContractId.value
     form.nodeErTreeId = nodeErTreeId.value
+    form.sampleId = editHtmlId.value
+    form.nodeId = rows[0].nodeId
     const { error, code, msg } = await commissionApi.htmlSave(form)
     if (!error && code === 200) {
         window.$message.success('创建成功')