iZaiZaiA 2 роки тому
батько
коміт
39986d4034

+ 7 - 0
src/api/modules/other.js

@@ -39,3 +39,10 @@ export const getReportNumber = (form, msg = true) => httpApi({
     method: 'get',
     params: form
 }, msg);
+
+//获取类型
+export const getDictionary = (form, msg = true) => httpApi({
+    url: '/api/blade-system/dict/dictionary',
+    method: 'get',
+    params: form
+}, msg);

+ 1 - 1
src/config/index.js

@@ -17,7 +17,7 @@ export default {
     statusWhiteList: [],    //http的status默认放行列表
     ossUrl: 'https://bladex-test-info.oss-cn-chengdu.aliyuncs.com', //oss地址
     smsPhone: '',  //测试接受短信验证码的手机号
-    dev_version: '202209221600',    //开发版本号
+    dev_version: '202209221822',    //开发版本号
     prod_host: 'http://47.110.251.215:8090',  //线上
     dev_host: 'http://192.168.4.6', //黄键楠
     //dev_host: 'http://192.168.3.13', //祝炜

+ 18 - 1
src/views/data-fill/wbs.vue

@@ -323,6 +323,7 @@ import WbsTree from "./components/WbsTree.vue"
 import {getTokenHeader} from '~src/api/request/header';
 import {getStoreData, setStoreData} from '~src/utils/storage'
 import {isType, deepClone, formValidate} from "vue-utils-plus"
+import {getDictionary} from "~api/other"
 import wbsApi from "~api/data-fill/wbs"
 import Draggable from "vuedraggable";
 
@@ -544,6 +545,7 @@ const setTreeMenuDataClick = ({key,node,data}) => {
     if (key === 'mark' || key === 'cancel_mark') {
         firstItemBox()
     } else if (key === 'edit') {
+        getDictionaryApi(data?.type)
         if (tabKey === 'tree') {
             const parent = deepClone(node?.parent?.data || {})
             formEditNodeModel.value = {...deepClone(data), parent: parent}
@@ -592,6 +594,14 @@ const setTreeMenuDataClick = ({key,node,data}) => {
     }
 }
 
+//获取节点类型
+const getDictionaryApi = async (type) => {
+    const { error, code, data } = await getDictionary({
+        wbs_node_type: type,
+    })
+    console.log(data)
+}
+
 //上传前
 const loadingReactive = ref(null)
 const beforeUpload = () => {
@@ -664,7 +674,14 @@ const firstItemHttp = async (info) => {
 
 //编辑节点
 const editNodeModal = ref(false)
-const nodeTypeData = ref([{label: "分项工程", value: 1}, {label: "分部工程", value: 2}])
+const nodeTypeData = ref([
+    {label: "单位工程", value: 1},
+    {label: "分项工程", value: 2},
+    {label: "子分项工程", value: 3},
+    {label: "分部工程", value: 4},
+    {label: "子分部工程", value: 5},
+    {label: "工序", value: 6},
+])
 const formEditNodeRef = ref(null)
 const formEditNodeModel = ref({})
 const formEditNodeRules = {

+ 10 - 6
src/views/gauge/bezier.vue

@@ -584,17 +584,21 @@ const handleUploadProgress = () => {
     importLoading.value = true
 }
 //上传完成
-const handleUploadFinish = () => {
+const handleUploadFinish = (res) => {
     importLoading.value = false
     showImportModal.value = false
-    window?.$message?.success('导入成功')
-    uploadRef.value?.clearFiles()
-    getTableData()
+    if (res.code === 200) {
+        window?.$message?.success(res.msg)
+        uploadRef.value?.clearFiles()
+        getTableData()
+    } else {
+        window?.$message?.error(res.msg)
+    }
 }
 //上传失败
-const handleUploadError = () => {
+const handleUploadError = (res) => {
     importLoading.value = false
-    window?.$message?.error('导入失败')
+    window?.$message?.error(res.msg || '导入失败')
 }
 
 //导出