merge fix

src/views/home/component/inspect/Inspect1.vue

@@ -1,14 +1,18 @@
 <template>
   <div class='flex flex-justify-start flex-align-center flex-col'>
-    <span class='full-width text-left mt-20'>{{ info.dictValue }}</span>
+    <span class='bold full-width text-left mt-20'>{{ info.dictValue }}</span>
     <div style='width: 95%;' class='mt-20'>
       <avue-crud
           :option="option"
           :data="data"
           ref="crud"
           v-model="form"
+          v-model:page='page'
           :table-loading="loading"
           :before-open="beforeOpen"
+          @current-change="currentChange"
+          @size-change="sizeChange"
+          @refresh-change="refreshChange"
           @row-del="rowDel"
           @row-save="rowSave"
           @row-update="rowUpdate">
@@ -152,6 +156,7 @@ export default {
       this.loading = true
       this.$api.inspect.list(Object.assign(this.page, data)).then(res => {
         this.data = res.data.records
+        this.page.total = res.data.total
         if (this.data.length > 0) {
           const hasReport = this.data[0].hasReport
           if (!hasReport) {
@@ -180,6 +185,15 @@ export default {
       }
       done()
     },
+    currentChange (currentPage) {
+      console.log(currentPage)
+      this.page.current = currentPage
+      this.refreshChange()
+    },
+    sizeChange (pageSize) {
+      this.page.size = pageSize
+      this.refreshChange()
+    },
     refreshChange () {
       this.onLoad()
     },

src/views/home/component/params/params1.vue

@@ -1,11 +1,14 @@
 <template>
   <div class='flex flex-justify-start flex-align-center flex-col'>
-    <span class='full-width text-left bold'>{{ info.dictValue }}</span>
+    <div class='flex flex-center full-width flex-justify-between mt-10 mb-10'>
+      <span class='full-width text-left bold'>{{ info.dictValue }}</span>
+      <el-button type='primary' @click='disabled = !disabled'>{{ disabled ? '编 辑':'保 存'}}</el-button>
+    </div>
     <div class='mt-10' style='width: 80%;'>
       <el-form
           :model="form"
           label-width='240px'
-          :disabled='true'
+          :disabled='disabled'
           label-position="left"
           class='form-content flex flex-col'
       >
@@ -92,14 +95,14 @@
             <el-input v-model="form.region"/>
           </el-form-item>
         </div>
-        <div class='full-width  flex '>
-          <el-form-item label="项目建设详细地址">
+        <div class='full-width  '>
+          <el-form-item label="项目建设详细地址" >
             <el-input v-model="form.name"/>
           </el-form-item>
         </div>
-        <div class='full-width  flex'>
-          <el-form-item label="主要建设内容及规模">
-            <el-input v-model="form.name"/>
+        <div class='full-width '>
+          <el-form-item label="主要建设内容及规模" >
+            <el-input v-model="form.name" type='textarea' :rows='4'/>
           </el-form-item>
         </div>
       </el-form>
@@ -118,6 +121,7 @@ export default {
   },
   data () {
     return {
+      disabled: true,
       form: {
         name: '',
         region: '',

src/views/home/component/params/params2.vue

@@ -1,12 +1,15 @@
 <template>
   <div class='flex flex-justify-start flex-align-center flex-col'>
-    <span class='full-width text-left bold'>{{ info.dictValue }}</span>
+    <div class='flex flex-center full-width flex-justify-between mt-10 mb-10'>
+      <span class='full-width text-left bold'>{{ info.dictValue }}</span>
+      <el-button type='primary' @click='disabled = !disabled'>{{ disabled ? '编 辑':'保 存'}}</el-button>
+    </div>
     <div class='mt-10' style='width: 80%;'>
       <el-form
           :model="form"
           label-width='240px'
           label-position="left"
-          :disabled='true'
+          :disabled='disabled'
           class='form-content flex flex-col'
       >
         <div class='flex flex-justify-start '>
@@ -67,6 +70,7 @@ export default {
   },
   data () {
     return {
+      disabled: true,
       form: {
         name: '',
         region: '',

src/views/home/component/params/params4.vue

@@ -1,65 +1,22 @@
 <template>
   <div class='flex flex-justify-start flex-align-center flex-col'>
-    <span class='full-width text-left bold'>{{ info.dictValue }}</span>
+    <div class='flex flex-center full-width flex-justify-between mt-10 mb-10'>
+      <span class='full-width text-left bold'>{{ info.dictValue }}</span>
+    </div>
     <div class='mt-10' style='width: 80%;'>
-      <el-form
-          :model="form"
-          label-width='140px'
-          :disabled='true'
-          class='form-content flex flex-col'
-      >
-        <div class='flex flex-justify-start '>
-          <el-form-item label="项目名称" style='flex:1'>
-            <el-input v-model="form.name"/>
-          </el-form-item>
-          <el-form-item label="总投资金额（万元）" style='flex:1' class='ml-20'>
-            <el-input v-model="form.region"/>
-          </el-form-item>
-        </div>
-        <div class='full-width  flex'>
-          <el-form-item label="县（区）" style='flex:1'>
-            <el-input v-model="form.name"/>
-          </el-form-item>
-          <el-form-item label="责任单位" style='flex:1' class='ml-20'>
-            <el-input v-model="form.region"/>
-          </el-form-item>
-        </div>
-
-        <div class='full-width  flex'>
-          <el-form-item label="主管单位" style='flex:1'>
-            <el-input v-model="form.name"/>
-          </el-form-item>
-          <el-form-item label="责任领导" style='flex:1' class='ml-20'>
-            <el-input v-model="form.region"/>
-          </el-form-item>
-        </div>
-        <div class='full-width  flex'>
-          <el-form-item label="项目负责人" style='flex:1'>
-            <el-input v-model="form.name"/>
-          </el-form-item>
-          <el-form-item label="联系电话" style='flex:1' class='ml-20'>
-            <el-input v-model="form.region"/>
-          </el-form-item>
-        </div>
-
-        <div class='full-width  flex'>
-          <el-form-item label="行业分类" style='flex:1'>
-            <el-input v-model="form.name"/>
-          </el-form-item>
-          <el-form-item label="建设起至时间" style='flex:1' class='ml-20'>
-            <el-input v-model="form.region"/>
-          </el-form-item>
-        </div>
-
-        <div class='full-width  flex'>
-          <el-form-item label="项目负责人" style='flex:1'>
-            <el-input v-model="form.name"/>
-          </el-form-item>
-          <el-form-item label="联系电话" style='flex:1' class='ml-20'>
-            <el-input v-model="form.region"/>
-          </el-form-item>
-        </div>
-      </el-form>
+      <avue-crud
+          :option="option"
+          :data="data"
+          ref="crud"
+          v-model="form"
+          :before-open="beforeOpen"
+          @row-del="rowDel"
+          @row-save="rowSave"
+          @row-update="rowUpdate">
+        <template #menu='{row}'>
+          <el-button text type='primary' icon='el-icon-upload'>上传</el-button>
+        </template>
+      </avue-crud>
     </div>
   </div>
 </template>
@@ -75,10 +32,93 @@ export default {
   },
   data () {
     return {
-      form: {
-        name: '',
-        region: '',
-        type: ''
+      disabled: true,
+      form: {},
+      data: [
+        {
+          name: '建设项目用地预审',
+          deptName: '',
+          docNo: '凤环函〔2018147]号'
+        },
+        {
+          name: '选址意见书',
+          deptName: '',
+          docNo: '选字第201900011号'
+        },
+        {
+          name: '环境影响评价批复',
+          deptName: '生态环境局',
+          docNo: ''
+        },
+        {
+          name: '项目建议书批复',
+          deptName: '',
+          docNo: ''
+        },
+        {
+          name: '可行性研究报告批复',
+          deptName: '发改局',
+          docNo: ''
+        },
+        {
+          name: '初步设计及概算批复',
+          deptName: '',
+          docNo: ''
+        },
+        {
+          name: '建设用地规划许可证',
+          deptName: '住建局',
+          docNo: ''
+        },
+        {
+          name: '开工许可证',
+          deptName: '住建局',
+          docNo: ''
+        },
+        {
+          name: '施工许可证',
+          deptName: '住建局',
+          docNo: ''
+        },
+        {
+          name: '建设工程规划许可证',
+          deptName: '住建局',
+          docNo: ''
+        }
+      ],
+      option: {
+        align: 'center',
+        menuAlign: 'center',
+        menuWidth: 380,
+        size: 'mini',
+        addBtn: false,
+        delBtn: false,
+        refreshBtn: false,
+        columnBtn: false,
+        labelWidth: 140,
+        border: true,
+        column: [
+          {
+            label: '审批事项（要件）',
+            prop: 'name',
+            display: false
+          },
+          {
+            label: '批复单位',
+            prop: 'deptName',
+            display: false
+          },
+          {
+            label: '文件',
+            prop: 'file',
+            hide: true,
+            type: 'upload'
+          },
+          {
+            label: '文号',
+            prop: 'docNo'
+          }
+        ]
       }
     }
   }

src/views/home/component/params/params5.vue

@@ -1,11 +1,14 @@
 <template>
   <div class='flex flex-justify-start flex-align-center flex-col'>
-    <span class='full-width text-left bold'>{{ info.dictValue }}</span>
+    <div class='flex flex-center full-width flex-justify-between mt-10 mb-10'>
+      <span class='full-width text-left bold'>{{ info.dictValue }}</span>
+      <el-button type='primary' @click='disabled = !disabled'>{{ disabled ? '编 辑' : '保 存' }}</el-button>
+    </div>
     <div class='mt-10' style='width: 80%;'>
       <el-form
           :model="form"
           label-width='140px'
-          :disabled='true'
+          :disabled='disabled'
           class='form-content flex flex-col'
       >
         <div class='flex flex-justify-start '>
@@ -75,6 +78,7 @@ export default {
   },
   data () {
     return {
+      disabled: true,
       form: {
         name: '',
         region: '',

src/views/home/component/params/params6.vue

@@ -1,11 +1,14 @@
 <template>
   <div class='flex flex-justify-start flex-align-center flex-col'>
-    <span class='full-width text-left bold'>{{ info.dictValue }}</span>
+    <div class='flex flex-center full-width flex-justify-between mt-10 mb-10'>
+      <span class='full-width text-left bold'>{{ info.dictValue }}</span>
+      <el-button type='primary' @click='disabled = !disabled'>{{ disabled ? '编 辑' : '保 存' }}</el-button>
+    </div>
     <div class='mt-10' style='width: 80%;'>
       <el-form
           :model="form"
           label-width='140px'
-          :disabled='true'
+          :disabled='disabled'
           class='form-content flex flex-col'
       >
         <div class='flex flex-justify-start '>
@@ -75,6 +78,7 @@ export default {
   },
   data () {
     return {
+      disabled: true,
       form: {
         name: '',
         region: '',

src/views/home/component/pro_left.vue

@@ -11,9 +11,9 @@
           <!--          <span class="bold mr-15" style="color:#787C90;">{{ currentSituation.dictValue }}</span>-->
           <el-select
               v-model="keyWords"
-              placeholder="修改"
+              class='bold'
+              :placeholder="currentSituation.dictValue"
               size="small"
-              style="width: 60px"
               @change="result"
           >
             <el-option
@@ -51,7 +51,7 @@ import proRelation from '@/views/home/component/pro_relation.vue'
 
 export default {
   name: 'pro_left',
-  components: { mainButton, proRelation },
+  components: { proRelation },
   props: {
     data: Object,
     code: {
@@ -98,7 +98,6 @@ export default {
       this.$bus.on('scorll', (e) => {
         const scrollTop = e.target.scrollTop
         const index = this.scorllTopList.findIndex(e => scrollTop >= e.start && scrollTop < e.end)
-        console.log(index)
         this.active = index
         if (e.target.scrollTop === 0) {
           this.active = 0
@@ -126,7 +125,6 @@ export default {
                 const data = {
                   index: i, start, end
                 }
-                console.log(data)
                 this.scorllTopList.push(data)
               }
             }, 500)

src/views/home/pro_detail.vue

@@ -22,11 +22,9 @@
       </div>
       <div v-else-if='currentTab.value === 2'>
         <basic-container v-for='(item,index) in resultList' :key='item.id'>
-          <a :href='`#header`+(index+1)'>
-            <div class='full-width' :id="`header`+(index+1)">
-              <inspect1 :info='item'/>
-            </div>
-          </a>
+          <div class='full-width' :id="`header`+(index+1)">
+            <inspect1 :info='item'/>
+          </div>
         </basic-container>
       </div>
       <div v-else-if='currentTab.value === 3'>
@@ -63,8 +61,8 @@ export default {
       data: {},
       tabs: [
         { name: '项目信息管理', value: 1, code: 'params_type' },
-        { name: '项目督查情况', value: 2, code: 'inspect_type' },
-        { name: '项目数据明细管理', value: 3 }
+        { name: '项目督查情况', value: 2, code: 'inspect_type' }
+        // { name: '项目数据明细管理', value: 3 }
       ],
       currentTab: null,
       resultList: [],