From 46c1cc68edde24dd0c2be4282d6c870535384ead Mon Sep 17 00:00:00 2001
From: wangwei <707714829@qq.com>
Date: Wed, 22 Jun 2022 10:11:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9B=AE=E5=BD=95=E7=BB=93?=
 =?UTF-8?q?=E6=9E=84=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/src/i18n/zh-CN.js                        | 15 ++++
 .../bsdataresources.vue}                      |  0
 .../bsinfrastructure.vue}                     |  0
 .../bscatalogue/applicationResources.vue      | 87 -------------------
 .../modules/bscatalogue/componentServices.vue | 86 ------------------
 back/src/views/modules/project/list.vue       | 16 ++--
 6 files changed, 25 insertions(+), 179 deletions(-)
 rename back/src/views/modules/{bscatalogue/dataResources.vue => ability/bsdataresources.vue} (100%)
 rename back/src/views/modules/{bscatalogue/infrastructure.vue => ability/bsinfrastructure.vue} (100%)
 delete mode 100644 back/src/views/modules/bscatalogue/applicationResources.vue
 delete mode 100644 back/src/views/modules/bscatalogue/componentServices.vue

diff --git a/back/src/i18n/zh-CN.js b/back/src/i18n/zh-CN.js
index a3c903e3..e78f7fd2 100644
--- a/back/src/i18n/zh-CN.js
+++ b/back/src/i18n/zh-CN.js
@@ -545,4 +545,19 @@ t.notice.new = '有新通知'
 t.notice.disconnect = '连接断开'
 t.notice.disconnectMessage = 'WebSocket连接已断开，请检查网络'
 
+t.projectList = {}
+t.projectList.projectName='项目名称'
+t.projectList.projectUnit='申请单位'
+t.projectList.departm='责任处室'
+t.projectList.date='申请日期'
+t.projectList.district='所属区市'
+t.projectList.contacts='业务联系人'
+t.projectList.contactstel='业务联系人电话'
+t.projectList.technology='技术联系人电话'
+t.projectList.technologytel='技术联系人电话'
+
+
+
+
+
 export default t
diff --git a/back/src/views/modules/bscatalogue/dataResources.vue b/back/src/views/modules/ability/bsdataresources.vue
similarity index 100%
rename from back/src/views/modules/bscatalogue/dataResources.vue
rename to back/src/views/modules/ability/bsdataresources.vue
diff --git a/back/src/views/modules/bscatalogue/infrastructure.vue b/back/src/views/modules/ability/bsinfrastructure.vue
similarity index 100%
rename from back/src/views/modules/bscatalogue/infrastructure.vue
rename to back/src/views/modules/ability/bsinfrastructure.vue
diff --git a/back/src/views/modules/bscatalogue/applicationResources.vue b/back/src/views/modules/bscatalogue/applicationResources.vue
deleted file mode 100644
index 78396782..00000000
--- a/back/src/views/modules/bscatalogue/applicationResources.vue
+++ /dev/null
@@ -1,87 +0,0 @@
-<!-- 应用资源目录编制      
-/bscatalogue/applicationResources -->
-<template>
-  <el-card shadow="never" class="aui-card--fill">
-    <div class="mod-pay__order">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <el-form-item>
-          <el-input v-model="dataForm.orderId" :placeholder="$t('order.orderId')" clearable></el-input>
-        </el-form-item>
-        <el-form-item>
-          <el-input v-model="dataForm.userId" :placeholder="$t('order.userId')" clearable></el-input>
-        </el-form-item>
-        <el-form-item>
-          <ren-select v-model="dataForm.status" dict-type="order_status" :placeholder="$t('order.status')"></ren-select>
-        </el-form-item>
-        <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
-        </el-form-item>
-      </el-form>
-      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
-        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-        <el-table-column prop="orderId" :label="$t('order.orderId')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="productName" :label="$t('order.productName')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="payAmount" :label="$t('order.payAmount')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="status" :label="$t('order.status')" header-align="center" align="center">
-          <template slot-scope="scope">
-            {{ $getDictLabel("order_status", scope.row.status) }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="payAt" :label="$t('order.payAt')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createDate" :label="$t('order.createDate')" header-align="center" align="center"></el-table-column>
-        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
-          <template slot-scope="scope">
-            <el-button v-if="scope.row.status === 0" type="text" size="small" @click="payHandle(scope.row.orderId)">{{ $t('order.pay') }}</el-button>
-            <el-button v-if="scope.row.status === 0" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <el-pagination
-        :current-page="page"
-        :page-sizes="[10, 20, 50, 100]"
-        :page-size="limit"
-        :total="total"
-        layout="total, sizes, prev, pager, next, jumper"
-        @size-change="pageSizeChangeHandle"
-        @current-change="pageCurrentChangeHandle">
-      </el-pagination>
-      <!-- 弹窗, 新增 / 修改 -->
-      <!-- <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update> -->
-    </div>
-  </el-card>
-</template>
-
-<script>
-import mixinViewModule from '@/mixins/view-module'
-// import AddOrUpdate from './order-add-or-update'
-import {addDynamicRoute} from "@/router";
-export default {
-  mixins: [mixinViewModule],
-  data () {
-    return {
-      mixinViewModuleOptions: {
-        getDataListURL: '/pay/order/page',
-        getDataListIsPage: true,
-        deleteURL: '/pay/order',
-        deleteIsBatch: true
-      },
-      dataForm: {
-        orderId: '',
-        status: '',
-        userId: ''
-      }
-    }
-  },
-  components: {
-    // AddOrUpdate
-  },
-  methods: {
-    payHandle (orderId) {
-      window.open(`${window.SITE_CONFIG['apiURL']}/pay/alipay/webPay?orderId=` + orderId);
-    }
-  }
-}
-</script>
diff --git a/back/src/views/modules/bscatalogue/componentServices.vue b/back/src/views/modules/bscatalogue/componentServices.vue
deleted file mode 100644
index 4f5aa024..00000000
--- a/back/src/views/modules/bscatalogue/componentServices.vue
+++ /dev/null
@@ -1,86 +0,0 @@
-<!-- 组件服务目录编制      /bscatalogue/componentServices -->
-<template>
-  <el-card shadow="never" class="aui-card--fill">
-    <div class="mod-pay__order">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <el-form-item>
-          <el-input v-model="dataForm.orderId" :placeholder="$t('order.orderId')" clearable></el-input>
-        </el-form-item>
-        <el-form-item>
-          <el-input v-model="dataForm.userId" :placeholder="$t('order.userId')" clearable></el-input>
-        </el-form-item>
-        <el-form-item>
-          <ren-select v-model="dataForm.status" dict-type="order_status" :placeholder="$t('order.status')"></ren-select>
-        </el-form-item>
-        <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
-        </el-form-item>
-      </el-form>
-      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
-        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-        <el-table-column prop="orderId" :label="$t('order.orderId')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="productName" :label="$t('order.productName')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="payAmount" :label="$t('order.payAmount')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="status" :label="$t('order.status')" header-align="center" align="center">
-          <template slot-scope="scope">
-            {{ $getDictLabel("order_status", scope.row.status) }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="payAt" :label="$t('order.payAt')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createDate" :label="$t('order.createDate')" header-align="center" align="center"></el-table-column>
-        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
-          <template slot-scope="scope">
-            <el-button v-if="scope.row.status === 0" type="text" size="small" @click="payHandle(scope.row.orderId)">{{ $t('order.pay') }}</el-button>
-            <el-button v-if="scope.row.status === 0" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <el-pagination
-        :current-page="page"
-        :page-sizes="[10, 20, 50, 100]"
-        :page-size="limit"
-        :total="total"
-        layout="total, sizes, prev, pager, next, jumper"
-        @size-change="pageSizeChangeHandle"
-        @current-change="pageCurrentChangeHandle">
-      </el-pagination>
-      <!-- 弹窗, 新增 / 修改 -->
-      <!-- <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update> -->
-    </div>
-  </el-card>
-</template>
-
-<script>
-import mixinViewModule from '@/mixins/view-module'
-// import AddOrUpdate from './order-add-or-update'
-import {addDynamicRoute} from "@/router";
-export default {
-  mixins: [mixinViewModule],
-  data () {
-    return {
-      mixinViewModuleOptions: {
-        getDataListURL: '/pay/order/page',
-        getDataListIsPage: true,
-        deleteURL: '/pay/order',
-        deleteIsBatch: true
-      },
-      dataForm: {
-        orderId: '',
-        status: '',
-        userId: ''
-      }
-    }
-  },
-  components: {
-    // AddOrUpdate
-  },
-  methods: {
-    payHandle (orderId) {
-      window.open(`${window.SITE_CONFIG['apiURL']}/pay/alipay/webPay?orderId=` + orderId);
-    }
-  }
-}
-</script>
diff --git a/back/src/views/modules/project/list.vue b/back/src/views/modules/project/list.vue
index 31227923..c144ba58 100644
--- a/back/src/views/modules/project/list.vue
+++ b/back/src/views/modules/project/list.vue
@@ -3,10 +3,13 @@
     <div class="mod-pay__order">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
         <el-form-item>
-          <el-input v-model="dataForm.orderId" :placeholder="$t('order.orderId')" clearable></el-input>
+          <el-input v-model="dataForm.orderId" :placeholder="$t('projectList.projectName')" clearable></el-input>
         </el-form-item>
         <el-form-item>
-          <el-input v-model="dataForm.userId" :placeholder="$t('order.userId')" clearable></el-input>
+          <el-input v-model="dataForm.userId" :placeholder="$t('projectList.projectUnit')" clearable></el-input>
+        </el-form-item>
+         <el-form-item>
+          <el-input v-model="dataForm.departm" :placeholder="$t('projectList.departm')" clearable></el-input>
         </el-form-item>
         <el-form-item>
           <ren-select v-model="dataForm.status" dict-type="order_status" :placeholder="$t('order.status')"></ren-select>
@@ -20,9 +23,9 @@
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
         <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-        <el-table-column prop="orderId" :label="$t('order.orderId')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="productName" :label="$t('order.productName')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="payAmount" :label="$t('order.payAmount')" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="orderId" :label="$t('projectList.projectName')" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="productName" :label="$t('projectList.projectUnit')" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="payAmount" :label="$t('projectList.district')" header-align="center" align="center"></el-table-column>
         <el-table-column prop="status" :label="$t('order.status')" header-align="center" align="center">
           <template slot-scope="scope">
             {{ $getDictLabel("order_status", scope.row.status) }}
@@ -69,7 +72,8 @@ export default {
       dataForm: {
         orderId: '',
         status: '',
-        userId: ''
+        userId: '',
+        departm:''
       }
     }
   },