添加合同金额

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

@@ -86,7 +86,7 @@ export default {
     //试验-客户端获取表的HTML
     async getExcelHtml(form) {
         return HcApi({
-            url: '/api/blade-manager/wbsPrivate/get-excel-html',
+            url: '/api/blade-manager/wbsPrivate/get-excel-html_entrust',
             method: 'get',
             params: form,
         }, false)

src/config/index.json

@@ -1,7 +1,7 @@
 {
     "version": "20230607160059",
-    "target1": "http://192.168.0.109:8090",
-    "target": "http://39.108.216.210:8090",
+    "target": "http://127.0.0.1:8090",
+    "target1": "http://39.108.216.210:8090",
     "smsPhone": "",
     "vite": {
         "port": 5174,

src/views/ledger/components/table-form.vue

@@ -879,23 +879,5 @@ onUnmounted(() => {
 </script>
 
 <style lang="scss" scoped>
-@import "./table-form.scss";
-</style>
-
-<style lang="scss">
-.node-many-tree {
-    position: relative;
-    .my-tree .el-tree-node .el-checkbox .el-checkbox__inner {
-        display: none;
-    }
-    .my-tree .el-tree-node .is-leaf + .el-checkbox .el-checkbox__inner {
-        display: inline-block;
-    }
-}
-.hc-table-form-content .hc-content-box .hc-table-forem-box .hc-fixed-page {
-    .el-button {
-        display: block;
-        margin: 20px;
-    }
-}
+    @import "./table-form.scss";
 </style>

src/views/tentative/detect/commission.vue

@@ -212,7 +212,7 @@ const nodeDataInfo = ref({})
 const nodeErTreeId = ref('')
 const wbsElTreeClick = ({ data, keys }) => {
     nodeDataInfo.value = data
-    nodeErTreeId.value = data['erTreeId'] || ''
+    //nodeErTreeId.value = data['erTreeId'] || ''
     //缓存自动展开
     treeAutoExpandKeys.value = keys
     setStoreValue('testTreeExpandKeys', keys)
@@ -335,15 +335,13 @@ const delegateContractChange = async () => {
 
 //获取委托html
 const getDelegateExcelHtml = async () => {
-    const { primaryKeyId } = nodeDataInfo.value
     const { error, code, msg, data } = await samplingApi.getExcelHtml({
-        primaryKeyId: nodeErTreeId.value,
-        projectId: projectId.value,
-        contractId: delegateContractId.value,
-        nodeId: primaryKeyId,
+        nodeId: searchForm.value.nodeId,
+        contractId: contractId.value,
     })
     if (!error && code === 200) {
         delegateHtml.value = isString(data) ? data : ''
+        nodeErTreeId.value = msg
     } else {
         delegateHtml.value = ''
         window.$message.error(msg || '获取委托信息失败')
@@ -557,14 +555,15 @@ const reportClick = () => {
     reportContractId.value = contractIds
     //处理类型
     const { contractType } = contractInfo.value
-    classifyType.value = contractType > 0 ? contractType + '' : '1'
+    // 委托单上报设置为1
+    classifyType.value = '1'  //contractType > 0 ? contractType + '' : '1'
     //其它数据
     reportIds.value = rows[0].id //数据ID
     reportTaskName.value = entrustName //任务名称
     //附加数据
     const { contractIdRelation } = nodeDataInfo.value
     reportAddition.value = {
-        taskType: '1', //说是用来区分委托单
+        taskType: '1', //用来区分委托单
         classify: classifyType.value,
         contractIdRelation: contractIdRelation,
     }

src/views/tentative/material/sampling.vue

@@ -842,12 +842,12 @@ const getDelegateDataInfo = async (editId) => {
 //获取委托html
 const getDelegateExcelHtml = async () => {
     const { error, code, msg, data } = await samplingApi.getExcelHtml({
-        primaryKeyId: nodeErTreeId.value,
-        projectId: projectId.value,
-        contractId: delegateContractId.value,
+        nodeId: primaryKeyId.value,
+        contractId: contractId.value,
     })
     if (!error && code === 200) {
         delegateHtml.value = isString(data) ? data : ''
+        nodeErTreeId.value = msg
     } else {
         delegateHtml.value = ''
         window.$message.error(msg || '获取委托信息失败')