chore

jsconfig.json

@@ -2,8 +2,9 @@
   "compilerOptions": {
     "baseUrl": "./",
     "paths": {
-        "@/*": ["src/*"]
+      "@/*": ["src/*"]
     }
   },
+  "vueCompilerOptions": { "experimentalDisableTemplateSupport": true, "target": 2 },
   "exclude": ["node_modules", "dist"]
 }

src/views/zhpt/projectManager/newInstall/proDispatch/addDispatch/index.vue

@@ -1,13 +1,14 @@
 <template>
   <div class="pageContentDiv" style="width: 100%; height: 88vh; padding: 8px 8px 0px 8px">
     <el-row ref="searchDiv" class="searchDiv">
-      <searchCom v-model="searchCom" />
-      <selectList v-model="search.userType" :config="userTypeConfig" />
+      <searchCom v-model="searchCom" :in-config="searchComConfig" />
+      <!-- <selectList v-model="search.userType" :config="userTypeConfig" />
       <timeSelect v-model="timeSelect" title="缴费日期" />
-      <selectList v-model="search.state" :config="stateConfig" />
-      <el-button type="primary" size="small" @click="searchData">搜索</el-button>
-      <el-button type="warning" size="small" style="margin-left: 20px" @click="gotoPage">工程概览</el-button>
-      <!-- <el-button type="primary" size="small" @click="lookInfo">详情</el-button> -->
+      <selectList v-model="search.state" :config="stateConfig" /> -->
+      <el-button type="primary" size="small" @click="searchData">查询</el-button>
+      <!-- <el-button type="warning" size="small" style="margin-left: 20px" @click="gotoPage">工程概览</el-button> -->
+      <addFlow />
+      <!-- <el-button type="primary" size="small" @click="add">加数据</el-button> -->
     </el-row>
     <div :style="`width:100%;padding:8px;height:calc(100% - ${rowHeight}px);`">
       <tableCom
@@ -17,34 +18,39 @@
         :config="tableConfig"
       />
     </div>
-    <subFlowInfo v-if="flowShow" v-model="flowShow" :config="config" :title="title" />
+    <SubFlowInfo v-if="flowShow" v-model="flowShow" :config="config" :title="title" />
   </div>
 </template>
 
 <script>
 import searchCom from '@/components/projectCom/searchCom/index.vue'
-import timeSelect from '@/components/projectCom/timeSelect/index.vue'
-import selectList from '@/components/projectCom/select/index.vue'
+// import timeSelect from '@/components/projectCom/timeSelect/index.vue'
+// import selectList from '@/components/projectCom/select/index.vue'
 import tableCom from '@/components/projectCom/table/index.vue'
+import addFlow from '@/views/zhpt/projectManager/newInstall/addFlow/index.vue'
 // import inputCom from '@/components/projectCom/input/index.vue'
-import commonMe from '@/utils/common.js'
+// import commonMe from '@/utils/common.js'
 // import { fetchAssignPage } from '@/api/waterProductionCost/assign'
 // import subFlowInfo from "@/views/zhpt/projectManager/newInstall/subFlowInfo/index.vue";
-import detailPage from './detailPage.vue'
-import inputPage from './inputPage.vue'
+// import detailPage from './detailPage.vue'
+// import inputPage from './inputPage.vue'
 import { getFlowPage } from '@/api/flowInfo'
+import commonFlow from '@/utils/commonFlow.js'
 export default {
   // eslint-disable-next-line
   name: 'addDispatch',
   components: {
-    timeSelect,
-    selectList,
+    // timeSelect,
+    // selectList,
     tableCom,
     // inputCom,
-    detailPage,
-    inputPage,
+    // eslint-disable-next-line
+    // detailPage,
+    // eslint-disable-next-line
+    // inputPage,
     searchCom,
-    subFlowInfo: () => import('@/views/zhpt/projectManager/newInstall/subFlowInfo/index.vue')
+    addFlow,
+    SubFlowInfo: () => import('@/views/zhpt/projectManager/newInstall/subFlowInfo/index.vue')
   },
   props: { data: { type: Object, default: () => ({}) } },
   data() {
@@ -59,6 +65,13 @@ export default {
       timeSelect: [],
       title: '',
       searchCom: {},
+      searchComConfig: {
+        showTime: true,
+        showDataConfig: true,
+        showState: true,
+        showUserType: true,
+        timeLabel: '发起时间'
+      },
       search: {
         // 查询条件（除开翻页以外的其它查询条件）
         userType: null, // 用户类型
@@ -127,16 +140,16 @@ export default {
             field: 'prejPerson', // 对应的字段
             minWidth: '120px'
           },
-          {
-            label: '缴费日期', // 表头显示
-            field: 'payData', // 对应的字段
-            minWidth: '100px'
-          },
-          {
-            label: '已缴费（元）', // 表头显示
-            field: 'payPrice', // 对应的字段
-            minWidth: '130px'
-          },
+          // {
+          //   label: '缴费日期', // 表头显示
+          //   field: 'payData', // 对应的字段
+          //   minWidth: '100px'
+          // },
+          // {
+          //   label: '已缴费（元）', // 表头显示
+          //   field: 'payPrice', // 对应的字段
+          //   minWidth: '130px'
+          // },
           {
             label: '工程性质', // 表头显示
             field: 'proNature', // 对应的字段
@@ -235,6 +248,9 @@ export default {
           },
           {
             label: '处理', // 展示标签
+            show: (e) => {
+              return commonFlow.getHandlInfo(this.$store, e, this.currentSearch)
+            },
             method: (e) => {
               this.handle(e)
             } // 触发的方法
@@ -252,7 +268,6 @@ export default {
   },
   mounted: function() {
     this.getTableHeight()
-    console.log('测试数据')
   },
   created() {
     this.config.subflowName = this.$options.name
@@ -261,7 +276,6 @@ export default {
   methods: {
     // 查询按钮
     searchData() {
-      const searchInfo = Object.assign(this.searchCom, this.search)
       this.$refs.tableCom.getTableDataByOne()
     },
 
@@ -270,19 +284,28 @@ export default {
      * @param pageInfo 翻页的数据
      */
     tableChage(pageInfo) {
-      const searchInfo = commonMe.notJsonCopy(Object.assign(this.searchCom, this.search))
-      const searchData = commonMe.notJsonCopy(this.search)
-      searchData.size = pageInfo.size
-      searchData.current = pageInfo.current
+      // const searchInfo = commonMe.notJsonCopy(Object.assign(this.searchCom, this.search))
+      // searchInfo.label = this.$route.name
+      // searchInfo.size = pageInfo.size
+      // searchInfo.current = pageInfo.current
 
-      searchData.dto = {
-        id: 16,
-        map: {
-          processStep: 15
-        } // searchInfo
-      }
-
-      return this.getData(searchData)
+      // searchInfo.dto = {
+      //   id: 16,
+      //   map: {
+      //     processStep: 15,
+      //     ...searchInfo
+      //   } // searchInfo
+      // }
+      return this.getData({
+        ...pageInfo,
+        dto: {
+          id: 16,
+          map: {
+            label: this.$route.name,
+            ...this.searchCom
+          }
+        }
+      })
     },
 
     /**

volar.config.js

@@ -0,0 +1,5 @@
+const vetur = require('@volar-plugins/vetur')
+
+module.exports = {
+  plugins: [vetur()]
+}