Merge remote-tracking branch 'origin/develop' into develop

src/layout/foolter.vue

@@ -21,7 +21,7 @@
     >
     <el-dialog v-model="show" width="540px" title="联系我们">
       <div class="flex flex-center flex-col font-16">
-        <span>电 话：+86-13908866200</span>
+        <span>电 话：+86 15887001274</span>
         <span class="mt-20 text-left"
           >地 址 : 昆明市五华区昌源北路620号融城圆城医药健康科技园-1408</span
         >

src/layout/top.vue

@@ -28,12 +28,12 @@
             class="padding flex flex-align-center pointer"
             :class="dataType === 'project' ? 'black' : 'white'"
           >
-            <el-button
-              icon="Search"
-              circle
-              color="#C1C4CB"
-              @click="show = true"
-            />
+            <!--            <el-button-->
+            <!--              icon="Search"-->
+            <!--              circle-->
+            <!--              color="#C1C4CB"-->
+            <!--              @click="show = true"-->
+            <!--            />-->
 
             <el-badge
               :value="msgCount"

src/page/login.vue

@@ -140,7 +140,7 @@
                 >
                 <div class="flex flex-col mt-10 flex-center">
                   <span class="grey-6">由梧桐研究院提供技术支持</span>
-                  <span class="grey-6 mt-5">使用问题请咨询：13908866200</span>
+                  <span class="grey-6 mt-5">使用问题请咨询：15887001274</span>
                   <el-button
                     color="#558FF1"
                     @click="
@@ -225,7 +225,7 @@ export default {
         ],
         pass: [
           { required: true, message: '请输入密码', trigger: 'blur' },
-          { min: 3, max: 12, message: '长度在 3 到 12 个字符', trigger: 'blur' }
+          { min: 3, max: 16, message: '长度在 3 到 16 个字符', trigger: 'blur' }
         ],
         code: [
           { required: true, message: '请输入验证码', trigger: 'blur' },

src/views/contract/index.vue

@@ -4,55 +4,55 @@
       <div class="flex">
         <div class="flex flex-center mt-15 mr-10">
           <el-form-item
-              label="关键字"
-              class="full-width"
-              style="margin-left: -50px"
+            label="关键字"
+            class="full-width"
+            style="margin-left: -50px"
           >
             <el-input
-                v-model="params.name"
-                placeholder="输入合同关键字"
-                prefix-icon="Search"
-                clearable
+              v-model="params.name"
+              placeholder="输入合同关键字"
+              prefix-icon="Search"
+              clearable
             />
           </el-form-item>
           <el-form-item class="full-width" label="合同类别">
             <el-select v-model="params.type" clearable>
               <el-option
-                  v-for="item in typelist"
-                  :key="item.dictKey"
-                  :label="item.dictValue"
-                  :value="item.dictKey"
+                v-for="item in typelist"
+                :key="item.dictKey"
+                :label="item.dictValue"
+                :value="item.dictKey"
               />
             </el-select>
           </el-form-item>
           <el-form-item class="full-width" label="合同状态">
             <el-select v-model="params.status" clearable>
               <el-option
-                  v-for="item in dicList"
-                  :key="item.dictKey"
-                  :label="item.dictValue"
-                  :value="item.dictKey"
+                v-for="item in dicList"
+                :key="item.dictKey"
+                :label="item.dictValue"
+                :value="item.dictKey"
               />
             </el-select>
           </el-form-item>
         </div>
         <div class="flex flex-center ml-20">
-          <base-button type="0" title="重置" icon="Refresh" @click="clearUp"/>
-          <base-button class="ml-20" @click="onLoad"/>
+          <base-button type="0" title="重置" icon="Refresh" @click="clearUp" />
+          <base-button class="ml-20" @click="onLoad" />
         </div>
       </div>
     </el-form>
     <avue-crud
-        :option="option"
-        :data="data"
-        ref="crud"
-        v-model="form"
-        v-model:page="page"
-        :before-open="beforeOpen"
-        @row-del="rowDel"
-        @current-change="currentChange"
-        @size-change="sizeChange"
-        @refresh-change="refreshChange"
+      :option="option"
+      :data="data"
+      ref="crud"
+      v-model="form"
+      v-model:page="page"
+      :before-open="beforeOpen"
+      @row-del="rowDel"
+      @current-change="currentChange"
+      @size-change="sizeChange"
+      @refresh-change="refreshChange"
     >
       <template #title="{ row }">
         <div>{{ row.fileFolder.title }}</div>
@@ -67,19 +67,14 @@
 <route>
 {
 name: '合同管理',
-<<<<<<< HEAD
 meta: { layout: 'empty','path':'/home/details','title':'资料管理','showMsg' : "请先通过资料管理，在对应的相关合同类别下上传合同文件，系统将自动识别所有相关文件并展示在以下列表中。"}
-=======
-meta: { layout: 'empty','path':'/home/details','title':'资料管理','showMsg' :
-"请先通过资料管理，在对应的相关合同类别下上传合同文件，系统将自动识别所有相关文件并展示在以下列表中。"}
->>>>>>> develop
 }
 </route>
 <script>
 import BaseButton from '@/components/base-button.vue'
 
 export default {
-  components: {BaseButton},
+  components: { BaseButton },
   data() {
     return {
       projectId: '',
@@ -143,7 +138,7 @@ export default {
             label: '合同状态',
             prop: 'contractsStatus',
             dicUrl:
-                '/api/blade-system/dict-biz/dictionary?code=contract-status',
+              '/api/blade-system/dict-biz/dictionary?code=contract-status',
             props: {
               label: 'dictValue',
               value: 'dictKey'
@@ -177,7 +172,7 @@ export default {
   },
   methods: {
     getDic(code) {
-      this.$api.common.dicList({code}).then(res => {
+      this.$api.common.dicList({ code }).then(res => {
         if (res.code === 200) {
           if (code === 'contract-status') {
             this.dicList = res.data
@@ -189,24 +184,24 @@ export default {
     },
     onLoad() {
       this.loading = true
-      const data = Object.assign(this.params, {projectId: this.projectId})
+      const data = Object.assign(this.params, { projectId: this.projectId })
       this.$api.contract
-          .contractList(Object.assign(this.page, data))
-          .then(res => {
-            this.data = res.data.records.map(ele => {
-              if (ele.contractsStatus === -1) {
-                ele.contractsStatus = ''
-              }
-              if (ele.type === -1) {
-                ele.type = ''
-              }
-              return ele
-            })
-            this.page.total = res.data.total
-          })
-          .finally(() => {
-            this.loading = false
+        .contractList(Object.assign(this.page, data))
+        .then(res => {
+          this.data = res.data.records.map(ele => {
+            if (ele.contractsStatus === -1) {
+              ele.contractsStatus = ''
+            }
+            if (ele.type === -1) {
+              ele.type = ''
+            }
+            return ele
           })
+          this.page.total = res.data.total
+        })
+        .finally(() => {
+          this.loading = false
+        })
     },
     clearUp() {
       this.params.name = ''
@@ -218,7 +213,7 @@ export default {
       if (type === 'view') {
         const data = this.$router.resolve({
           path: '/contract/detail',
-          query: {id: this.form.id}
+          query: { id: this.form.id }
         })
         window.open(data.href, '_blank')
       }
@@ -229,7 +224,7 @@ export default {
       }).then(res => {
         console.log(res)
         if (res === 'confirm') {
-          this.$api.contract.contractRemove({ids: row.id}).then(res => {
+          this.$api.contract.contractRemove({ ids: row.id }).then(res => {
             if (res.code === 200) {
               this.$message.success(res.msg)
               this.onLoad()

src/views/home/component/dash.vue

@@ -747,6 +747,13 @@ export default {
           this.tagsList = res.data
         }
       })
+      this.$api.common
+        .dicList({ code: 'industry-classification' })
+        .then(res => {
+          if (res.code === 200) {
+            this.industryList = res.data
+          }
+        })
     },
     report(res) {
       if (res.is_report === 1) {

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

@@ -490,6 +490,7 @@ export default {
       this.form.projectId = this.detail.id
       this.form.total_amount = Number.parseFloat(this.detail.total_amount)
       delete this.detail._id
+      delete this.form.dict_value
       this.$api.project.proUpdate(this.form).then(res => {
         if (res.code === 200) {
           this.$message.success(res.msg)
@@ -519,7 +520,6 @@ export default {
     changeIndustry(res) {
       const tmp = this.industryList.find(ele => ele.dictKey === res)
       this.form.dict_key = Number.parseInt(tmp.dictKey)
-      delete this.form.dict_value
     }
   }
 }

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

@@ -5,39 +5,39 @@
     </div>
     <div class="mt-10" style="width: 90%">
       <avue-crud
-          :option="option"
-          :data="data"
-          ref="crud"
-          v-model="form"
-          :before-open="beforeOpen"
-          @row-del="rowDel"
-          @row-save="rowSave"
-          @row-update="rowUpdate"
+        :option="option"
+        :data="data"
+        ref="crud"
+        v-model="form"
+        :before-open="beforeOpen"
+        @row-del="rowDel"
+        @row-save="rowSave"
+        @row-update="rowUpdate"
       >
         <template #menu-right>
           <div class="full-width">
             <el-button
-                icon="el-icon-refresh"
-                circle
-                @click="proInfo"
+              icon="el-icon-refresh"
+              circle
+              @click="proInfo"
             ></el-button>
           </div>
         </template>
         <template #menu="{ row }">
           <el-button
-              text
-              type="primary"
-              icon="el-icon-folder-checked"
-              @click="openFolder(row)"
-          >打开文件夹
+            text
+            type="primary"
+            icon="el-icon-folder-checked"
+            @click="openFolder(row)"
+            >打开文件夹
           </el-button>
           <el-button
-              text
-              type="primary"
-              icon="el-icon-view"
-              @click="edit(row)"
-              v-if="detail.can_update"
-          >文号提取
+            text
+            type="primary"
+            icon="el-icon-view"
+            @click="edit(row)"
+            v-if="detail.can_update"
+            >文号提取
           </el-button>
         </template>
         <template #file="{ row }">
@@ -56,23 +56,22 @@
       <div>
         <div class="bold font-16">{{ currentRow.file.originalFileName }}</div>
         <el-input
-            class="mt-20"
-            v-model="currentRow.file.copyNumber"
-            placeholder="附件清晰度或手写原因导致文号提取失败，请进行手动填写"
+          class="mt-20"
+          v-model="currentRow.file.copyNumber"
+          placeholder="附件清晰度或手写原因导致文号提取失败，请进行手动填写"
         ></el-input>
         <div class="mt-20 full-width flex flex-justify-end">
           <el-button plain type="primary" @click="show = false"
-          >取 消
-          </el-button
-          >
+            >取 消
+          </el-button>
           <el-button type="primary" @click="updateCopyNumber">确定</el-button>
         </div>
       </div>
     </el-dialog>
     <el-image-viewer
-        v-if="showImage"
-        :url-list="preList"
-        @close="showImage = false"
+      v-if="showImage"
+      :url-list="preList"
+      @close="showImage = false"
     />
   </div>
 </template>
@@ -80,6 +79,89 @@
 <script>
 import api from '@/api/index.js'
 
+const defaultData = [
+  {
+    name: '建设项目用地预审',
+    deptName: '',
+    docNo: '凤环函〔2018147]号',
+    edit: false,
+    dispatchType: 1,
+    prop: 'approval_no-land_use_pre_audit'
+  },
+  {
+    name: '选址意见书',
+    deptName: '',
+    docNo: '选字第201900011号',
+    edit: false,
+    dispatchType: 2,
+    prop: 'approval_no-site_select_opinions'
+  },
+  {
+    name: '环境影响评价批复',
+    deptName: '生态环境局',
+    edit: false,
+    docNo: '',
+    dispatchType: 3,
+    prop: 'approval_no-eia'
+  },
+  {
+    name: '项目建议书批复',
+    deptName: '',
+    docNo: '',
+    edit: false,
+    dispatchType: 4,
+    prop: 'approval_no-advice_ratify'
+  },
+  {
+    name: '可行性研究报告批复',
+    deptName: '发改局',
+    edit: false,
+    docNo: '',
+    dispatchType: 5,
+    prop: 'approval_no-feasibility_study'
+  },
+  {
+    name: '初步设计及概算批复',
+    deptName: '',
+    docNo: '',
+    edit: false,
+    dispatchType: 6,
+    prop: 'approval_no-design'
+  },
+  {
+    name: '建设用地规划许可证',
+    deptName: '住建局',
+    docNo: '',
+    edit: false,
+    dispatchType: 7,
+    prop: 'approval_no-land_user'
+  },
+  {
+    name: '开工许可证',
+    deptName: '住建局',
+    docNo: '',
+    edit: false,
+    dispatchType: 8,
+    prop: 'approval_no-permit_no'
+  },
+  {
+    name: '施工许可证',
+    deptName: '住建局',
+    docNo: '',
+    edit: false,
+    dispatchType: 9,
+    prop: 'approval_no-construction_permit'
+  },
+  {
+    name: '建设工程规划许可证',
+    deptName: '住建局',
+    docNo: '',
+    edit: false,
+    dispatchType: 10,
+    prop: 'approval_no-construction_plan_permit'
+  }
+]
+
 export default {
   name: 'params4',
   props: {
@@ -116,88 +198,7 @@ export default {
       currentRow: null,
       disabled: true,
       form: {},
-      data: [
-        {
-          name: '建设项目用地预审',
-          deptName: '',
-          docNo: '凤环函〔2018147]号',
-          edit: false,
-          dispatchType: 1,
-          prop: 'approval_no-land_use_pre_audit'
-        },
-        {
-          name: '选址意见书',
-          deptName: '',
-          docNo: '选字第201900011号',
-          edit: false,
-          dispatchType: 2,
-          prop: 'approval_no-site_select_opinions'
-        },
-        {
-          name: '环境影响评价批复',
-          deptName: '生态环境局',
-          edit: false,
-          docNo: '',
-          dispatchType: 3,
-          prop: 'approval_no-eia'
-        },
-        {
-          name: '项目建议书批复',
-          deptName: '',
-          docNo: '',
-          edit: false,
-          dispatchType: 4,
-          prop: 'approval_no-advice_ratify'
-        },
-        {
-          name: '可行性研究报告批复',
-          deptName: '发改局',
-          edit: false,
-          docNo: '',
-          dispatchType: 5,
-          prop: 'approval_no-feasibility_study'
-        },
-        {
-          name: '初步设计及概算批复',
-          deptName: '',
-          docNo: '',
-          edit: false,
-          dispatchType: 6,
-          prop: 'approval_no-design'
-        },
-        {
-          name: '建设用地规划许可证',
-          deptName: '住建局',
-          docNo: '',
-          edit: false,
-          dispatchType: 7,
-          prop: 'approval_no-land_user'
-        },
-        {
-          name: '开工许可证',
-          deptName: '住建局',
-          docNo: '',
-          edit: false,
-          dispatchType: 8,
-          prop: 'approval_no-permit_no'
-        },
-        {
-          name: '施工许可证',
-          deptName: '住建局',
-          docNo: '',
-          edit: false,
-          dispatchType: 9,
-          prop: 'approval_no-construction_permit'
-        },
-        {
-          name: '建设工程规划许可证',
-          deptName: '住建局',
-          docNo: '',
-          edit: false,
-          dispatchType: 10,
-          prop: 'approval_no-construction_plan_permit'
-        }
-      ],
+      data: [],
       option: {
         align: 'center',
         menuAlign: 'center',
@@ -287,7 +288,7 @@ export default {
       if (api.offices.includes(item.file.suffix)) {
         const routeData = this.$router.resolve({
           path: '/home/file_detail',
-          query: {id: item.fileId}
+          query: { id: item.fileId }
         })
         window.open(routeData.href, '_blank')
       } else {
@@ -312,6 +313,7 @@ export default {
       window.open(routeUrl.href, '_blank')
     },
     initFileList(list) {
+      this.data = defaultData
       if (list && list.length === 0) {
         return
       }
@@ -333,7 +335,7 @@ export default {
         type: 'warning'
       }).then(res => {
         if (res === 'confirm') {
-          this.$api.project.fileRemove({ids: row.pid, type: 3}).then(res => {
+          this.$api.project.fileRemove({ ids: row.pid, type: 3 }).then(res => {
             if (res.code === 200) {
               this.$message.success(res.msg)
               this.proInfo()
@@ -355,18 +357,18 @@ export default {
         return
       }
       this.$api.common
-          .fileUpdate({
-            id: this.currentRow.fileId,
-            copyNumber: this.currentRow.file.copyNumber
-          })
-          .then(res => {
-            if (res.code === 200) {
-              this.show = false
-              this.$message.success(res.msg)
-            } else {
-              this.$message.error(res.msg)
-            }
-          })
+        .fileUpdate({
+          id: this.currentRow.fileId,
+          copyNumber: this.currentRow.file.copyNumber
+        })
+        .then(res => {
+          if (res.code === 200) {
+            this.show = false
+            this.$message.success(res.msg)
+          } else {
+            this.$message.error(res.msg)
+          }
+        })
     }
   }
 }