Quellcode durchsuchen

feature(优化): 项目页面优化

ZZH-wl vor 2 Jahren
Ursprung
Commit
5ccb140eb9

+ 1 - 1
.env.development

@@ -4,7 +4,7 @@ VUE_APP_TENANT=default
 ## websocket地址
 #VUE_APP_WEBSOCKET_URL=ws://192.168.0.252:8899/ws
 ## GateWay地址
-#VUE_APP_MicroSrvProxy_API=http://192.168.0.252:8100/
+#VUE_APP_MicroSrvProxy_API=http://192.168.0.252:8200/
 ## 登录验证微服务名称
 #VUE_APP_AdminPath=dashoo.labsop.lims_latest_opms_admin
 ## 业务接口微服务名称

+ 1 - 0
package.json

@@ -5,6 +5,7 @@
   "author": "chuzhixin",
   "scripts": {
     "serve": "vue-cli-service serve --mode development",
+    "build:dev": "vue-cli-service build --mode development",
     "build": "vue-cli-service build -mode production",
     "lint": "vue-cli-service lint",
     "lint:eslint": "eslint {src,mock}/**/*.{vue,js} --fix",

+ 2 - 2
src/views/proj/business/components/DetailsContract.vue

@@ -119,14 +119,14 @@
           },
           {
             label: '合同签订时间',
-            width: '120px',
+            width: '180px',
             prop: 'createdTime',
             sortable: false,
             disableCheck: false,
           },
           {
             label: '合同有效时间',
-            width: '200px',
+            width: '180px',
             prop: 'contractStartTime',
             sortable: false,
             disableCheck: false,

+ 17 - 6
src/views/proj/business/index.vue

@@ -74,7 +74,7 @@
         :key="index"
         align="center"
         :label="item.label"
-        :min-width="item.width"
+        :min-width="item.minWidth"
         :prop="item.prop"
         show-overflow-tooltip
         :sortable="item.sortable"
@@ -117,6 +117,9 @@
           <span v-else-if="item.prop === 'nboBudget'">
             {{ formatPrice(row.nboBudget) }}
           </span>
+          <span v-else-if="item.prop === 'contractAmount'">
+            {{ formatPrice(row.contractAmount) }}
+          </span>
           <span v-else-if="item.prop === 'filingTime'">
             {{ parseTime(row.filingTime, '{y}-{m}-{d} {h}:{i}') }}
           </span>
@@ -126,6 +129,12 @@
           <span v-else-if="item.prop === 'nextFollowTime'">
             {{ parseTime(row.nextFollowTime, '{y}-{m}-{d} {h}:{i}') }}
           </span>
+          <span v-else-if="item.prop === 'projClosingTime'">
+            {{ parseTime(row.projClosingTime, '{y}-{m}-{d} {h}:{i}') }}
+          </span>
+          <span v-else-if="item.prop === 'projConversionTime'">
+            {{ parseTime(row.projConversionTime, '{y}-{m}-{d} {h}:{i}') }}
+          </span>
           <span v-else>{{ row[item.prop] }}</span>
         </template>
       </el-table-column>
@@ -181,8 +190,8 @@
           {
             label: '项目名称',
             prop: 'nboName',
-            width: '160px',
-            minWidth: '160px',
+            width: '180px',
+            minWidth: '180px',
             sortable: false,
             disableCheck: true,
           },
@@ -204,7 +213,7 @@
           {
             label: '客户名称',
             prop: 'custName',
-            width: '200px',
+            width: 'auto',
             minWidth: '180px',
           },
           {
@@ -225,7 +234,8 @@
           {
             label: '经销商/代理商',
             prop: 'distributorName',
-            width: '160px',
+            minWidth: '160px',
+            width: 'auto',
           },
           {
             label: '产品线',
@@ -421,6 +431,7 @@
           .catch((err) => console.log(err))
       },
       handleTabClick() {
+        this.queryForm.pageNum = 1
         console.log(this.activeName)
         if (this.activeName !== 'all') {
           this.queryForm.nboType = this.activeName
@@ -501,7 +512,7 @@
       /** 重置按钮操作 */
       resetQuery() {
         this.resetForm('queryForm')
-        this.fetchData()
+        this.handleTabClick()
       },
       setSelectRows(val) {
         this.selectRows = val