From 1f9090b0b85200ebdb1316d3848b2b1198a65b9c Mon Sep 17 00:00:00 2001
From: guoweilong <mo@mddzwhfgs.wecom.work>
Date: Thu, 6 Jun 2024 18:15:20 +0800
Subject: [PATCH] fix:修改问题

---
 manifest.json                               |  2 +-
 pages/charge/visitsAndFees/createaVisit.vue | 28 +++++++++++++++++-----------
 pages/charge/visitsAndFees/index.vue        | 19 ++++++++++---------
 utils/dict.js                               |  2 ++
 utils/permission.js                         |  1 -
 5 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/manifest.json b/manifest.json
index 3dde25e..3b9b09e 100644
--- a/manifest.json
+++ b/manifest.json
@@ -83,7 +83,7 @@
             "disableHostCheck" : true,
             "proxy" : {
                 "/api" : {
-                    "target" : "http://dz64qt.natappfree.cc",
+                    "target" : "http://192.168.0.8:8001",
                     "changeOrigin" : true,
                     "secure" : true,
                     "pathRewrite" : {
diff --git a/pages/charge/visitsAndFees/createaVisit.vue b/pages/charge/visitsAndFees/createaVisit.vue
index d440225..017dcc4 100644
--- a/pages/charge/visitsAndFees/createaVisit.vue
+++ b/pages/charge/visitsAndFees/createaVisit.vue
@@ -11,8 +11,8 @@
           <view class="" v-for="(item,index) in basisData" :key="index">
             <u-form-item :required="item.required" :label="item.label" labelWidth="100" borderBottom
               v-if="item.type === 'date'" :prop="item.key">
-              <u-input v-model="model[item.key]" inputAlign="right" :placeholder="item.placeholder" disabled
-                border="none" :disabledColor="operationStatus==='YD'?'#F5F7FA':'#fff'"></u-input>
+              <u-input v-model="model[item.key]" inputAlign="right" :placeholder="item.placeholder" border="none"
+                :disabledColor="operationStatus==='YD'?'#F5F7FA':'#fff'"></u-input>
               <u-icon slot="right" name="calendar" size="20" @click="handleDateTime(item)"></u-icon>
               <!-- <u-icon slot="right" name="calendar" size="20" @click="handleDateTime(item)"></u-icon> -->
             </u-form-item>
@@ -20,8 +20,8 @@
             <u-form-item :required="item.required" :label="item.label" labelWidth="100" borderBottom
               v-if="item.type === 'input'" :prop="item.key">
               <u-input v-model="model[item.key]" inputAlign="right" :placeholder="item.placeholder"
-                :disabled="operationStatus ==='YD'" :disabledColor="operationStatus==='YD'?'#F5F7FA':'#fff'"
-                border="none"></u-input>
+                :disabled="operationStatus ==='YD' || item.key === 'billingPersonName'"
+                :disabledColor="operationStatus==='YD'?'#F5F7FA':'#fff'" border="none"></u-input>
               <view class="" style="width: 40rpx;height: 40rpx;"></view>
             </u-form-item>
             <!-- 选择类型 -->
@@ -75,7 +75,7 @@
             <!-- 文件 -->
             <u-form-item :required="item.required" :label="item.label" labelWidth="75%" borderBottom
               v-if="item.type === 'file' && item.show" :prop="item.key">
-              <u-upload :fileList="fileList" @afterRead="afterRead" @delete="deletePic" name="1" multiple :maxCount="10"
+              <u-upload :fileList="fileList" @afterRead="afterRead" @delete="deletePic" name="1" multiple :maxCount="1"
                 :disabled="operationStatus ==='YD'" width="100rpx" height="100rpx"></u-upload>
             </u-form-item>
           </view>
@@ -194,7 +194,7 @@
       @close="gsShow = false" keyName="label" @confirm="gsConfirm" @change="changeHandler"></u-picker>
 
     <u-datetime-picker :show="datetimeShow" v-model="dataTimeValue" closeOnClickOverlay @confirm="dateConfirm"
-      @cancel="datetimeShow = false" @close="datetimeShow = false" mode="datetime"></u-datetime-picker>
+      @cancel="datetimeShow = false" @close="datetimeShow = false" mode="date"></u-datetime-picker>
   </view>
 </template>
 
@@ -410,7 +410,7 @@
           placeholder: "请输入",
           type: "input",
           required: true,
-          key: "billingPersonName"
+          key: "billingPersonName",
         }, {
           label: '兼职/全职',
           placeholder: "请选择",
@@ -470,11 +470,12 @@
           show: true,
         }, {
           label: '是否有意向',
-          // placeholder: "请选择",
+          placeholder: "请选择",
           required: true,
-          type: "radio",
+          type: "select",
           key: "isIntent",
           show: true,
+          dict: 'sys_cn_yn'
         }, {
           label: '房屋情况',
           placeholder: "请选择",
@@ -659,6 +660,7 @@
 
     },
     onLoad(data) {
+      this.init();
       console.log(data);
       if (data.objData) {
         let obj = JSON.parse(data.objData);
@@ -680,7 +682,6 @@
           this.operationStatus = "TJ" //添加
         }
       }
-      this.init()
     },
     methods: {
       // 编辑或异动需要填充数据
@@ -724,10 +725,15 @@
       },
       async init() {
         console.log(this.$store);
+        // 默认选是
+        this.model.isCharged = '是';
+        this.model.isVisited = '是';
+        this.model.hasDm = '是';
         // 查询财年
         await this.getCurrentFiscalYear()
         await this.getCompanyCascader()
         let nickName = uni.getStorageSync("nickName");
+
         this.$set(this.model, 'billingPersonName', nickName)
         // console.log(this.model.billingPersonName);
       },
@@ -919,7 +925,7 @@
       },
       // 时间弹出层确认
       dateConfirm(e) {
-        let time = this.$u.timeFormat(e.value, 'yyyy-mm-dd hh:MM:ss');
+        let time = this.$u.timeFormat(e.value, 'yyyy-mm-dd');
         console.log("选择时间", time);
         this.model[this.currentName] = time;
         this.datetimeShow = false;
diff --git a/pages/charge/visitsAndFees/index.vue b/pages/charge/visitsAndFees/index.vue
index 5b9bbda..32b23a9 100644
--- a/pages/charge/visitsAndFees/index.vue
+++ b/pages/charge/visitsAndFees/index.vue
@@ -63,8 +63,8 @@
           <text class="text-grey margin-right-xs">用户:</text>{{item.userName|| "--"}}
         </view>
       </view>
-      <view class="flex justify-end margin-top">
-        <view class="margin-left-sm">
+      <view class="flex justify-between margin-top">
+        <view class="margin-right-xs">
           <zb-popover placement="bottom-start" theme="dark" ref="Popover1" class="item-popover">
             <view slot="content" class="popoverCss">
               <view class="" v-if="publishChangePermission(item)">
@@ -87,25 +87,25 @@
             <u-button shape="circle">更多操作</u-button>
           </zb-popover>
         </view>
-        <view class="margin-left-sm" @click="handleEdit(item)" v-if="editPermission(item)">
-          <u-button shape="circle" type="primary">修改</u-button>
+        <view class="margin-right-xs" @click="handleEdit(item)" v-if="editPermission(item)">
+          <u-button shape="circle" color="#CF000D">修改</u-button>
         </view>
-        <view class="margin-left-sm" @click="handleDetail(item)" >
+        <view class="margin-right-xs" @click="handleDetail(item)" >
           <u-button shape="circle">查看详情</u-button>
         </view>
-        <view class="margin-left-sm" @click="handleRefuse(item)" v-if="auditPermission(item)">
+        <view class="margin-right-xs" @click="handleRefuse(item)" v-if="auditPermission(item)">
           <u-button shape="circle">拒绝</u-button>
         </view>
-        <view class="margin-left-sm" @click="handleAgree(item)" v-if="auditPermission(item)">
+        <view class="" @click="handleAgree(item)" v-if="auditPermission(item)">
           <u-button shape="circle" color="#CF000D">同意</u-button>
         </view>
       </view>
-      <view class="nodeCss" v-if="item.statusCode === 'APPROVE'">
+      <view class="nodeCss" v-if="item.statusCode === 'APPROVE' || item.statusCode === 'EDITING'">
         {{item.statusNodeName}}
       </view>
     </view>
     <u-loadmore :status="status" v-if="list.length > 0" />
-    <u-empty text="暂无资讯" icon="/static/images/icon/nodata.png" v-else></u-empty>
+    <u-empty text="暂无拜访/收费数据" icon="/static/images/icon/nodata.png" v-else></u-empty>
 
     <view  v-if="$checkPermi(['schsf:mcVisit:add'])" class="fixBtnCss" @click="createaVisit">
       <u-icon name="plus" color="#fff" size="30"></u-icon>
@@ -311,6 +311,7 @@
         console.log('item', JSON.parse(JSON.stringify(item)));
       },
       onSearch(e) {
+        this.params.pageNum  = 1;
         this.params.userName = this.keyword;
         this.initData()
         console.log("搜索", e);
diff --git a/utils/dict.js b/utils/dict.js
index f67cc54..a536a95 100644
--- a/utils/dict.js
+++ b/utils/dict.js
@@ -7,6 +7,8 @@ import store from '@/store'
 
 export const DICT_TYPE = {
   // ==========  APP模块 ==========
+  SYS_YES_NO: 'sys_yes_no', //系统是否
+  SYS_CN_YN: 'sys_cn_yn', //系统是否
   SYS_PLATE_NAME: 'sys_plate_name', // 板块名称
   SYS_HOUSEHOLD_AGE: 'sys_household_age', // 户主年龄
   SYS_LIVE_NO: 'sys_live_no', //居住人口
diff --git a/utils/permission.js b/utils/permission.js
index 9460e80..5a6559c 100644
--- a/utils/permission.js
+++ b/utils/permission.js
@@ -10,7 +10,6 @@ export function checkPermi(value) {
     const permissions = store.getters && store.getters.permissions
     const permissionDatas = value
     const all_permission = "*:*:*"
-
     const hasPermission = permissions.some(permission => {
       return all_permission === permission || permissionDatas.includes(permission)
     })
--
libgit2 0.21.2