客户接待修改

package-basic-data/pages/customer-reception/customer-reception.wxml

@@ -2,7 +2,6 @@
 <wxs src='/utils/wxmlUtil.wxs' module="wxmlUtil"></wxs>
 <loading wx:if="{{loading}}" ></loading>
 <van-sticky scroll-top="0">
-  <!-- 查询条件 -->
   <dk-dropdown-menu model:value="{{searchForm}}" menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}" bind:search="searchData" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,['customerName'\,'telephone','adddress','contractNumber'])}}">
   </dk-dropdown-menu>
   <dk-tabs active="{{active}}" list="{{tagList}}" bind:onChange="onChangeTabs">    </dk-tabs>

package-basic-data/pages/customer-reception/measure-to/measure-to.js

@@ -11,6 +11,7 @@ const Constants = require('@/utils/Constants.js');
 const util = require('@/utils/util.js')
 const mixins = require('@/mixins/index.js')
 const app = getApp()
+const config = require('@/config/config.js')
 Page({
   mixins: [mixins],
   /**
@@ -19,6 +20,7 @@ Page({
   data: {
     routeObjName: 'cusFollow',
     cardList: ['main'],
+    maxSize: Constants.uploadFileConfig.maxSize,
     buttonSaveList: [{ code: 'add', title: mixins.$t('save'), width: '120rpx' }],
     contentObj: {
       main: [
@@ -27,15 +29,15 @@ Page({
         { code: 'addressFull', type: 'address', title: mixins.$t('addressFull'), required: false, readonly: true },
         { code: 'addressNo', type: 'str', required: false, title: mixins.$t('addressNo'), readonly: true },
         { code: 'staffName', type: 'str', required: false, title: mixins.$t('sales'), readonly: true },
-        { code: 'flgAgainMeasure', type: 'checkedBox', required: false, title:  mixins.$t('flgAgainMeasure'), readonly: false },
-        { code: 'measureRemarks', type: 'textarea', required: false, rows: '5', title:  mixins.$t('measureRemarks') },
-        { code: 'measureTime', type: 'dateTime', required: true, title:  mixins.$t('measureTime') },
+        { code: 'flgAgainMeasure', type: 'checkedBox', required: false, title: mixins.$t('flgAgainMeasure'), readonly: false },
+        { code: 'measureRemarks', type: 'textarea', required: false, rows: '5', title: mixins.$t('measureRemarks') },
+        { code: 'measureTime', type: 'dateTime', required: true, title: mixins.$t('measureTime') },
       ]
     },
     measureRoomList: [
       {
         roomName: '',
-        measureAnnex: {},
+        measureAnnex: [],
       }
     ],
   },
@@ -48,13 +50,58 @@ Page({
     let measureRoomList = this.data.measureRoomList;
     measureRoomList.push({
       roomName: '',
-      measureAnnex: {},
+      measureAnnex: [],
     })
     this.setData({
       measureRoomList: measureRoomList
     })
   },
-
+    /**
+     * @desc : 上传附件
+     * @author : 周兴
+     * @date : 2024/3/27 16:16
+     */
+    afterRead(e) {
+      let index = e.currentTarget.dataset.index
+      let measureRoomList = this.data.measureRoomList
+      const _this = this;
+      const {
+        file
+      } = e.detail;
+      // 配置存放的文件夹 公司code - 表名 - 年月 -- 日
+      let folder = app.globalData.company.cpCode + '/' + 't_crm_measure_room' + '/' + new Date().toYearMonth2() + '/' + new Date().toDay()
+      let url = config.upload_url;
+      url = url.replace('mdm-server', 'mdm-server' + '-' + app.globalData.company.svcCode.replace('_', '-'))
+      file.forEach(res => {
+        // 当设置 mutiple 为 true 时, file 为数组格式，否则为对象格式
+        wx.uploadFile({
+          url: url,
+          filePath: res.path,
+          name: 'file',
+          formData: {
+            'folder': folder
+          },
+          header: {
+            'Authorization': 'Bearer ' + app.globalData.token
+          },
+          success(res) {
+            let data = JSON.parse(res.data)
+            if (data.code === 200) {
+              _this.setData({
+                uploadFileFlag: false
+              })
+              let annexPaths = measureRoomList[index]['measureAnnex'] || []
+              data.data.url = config.image_url + data.data.path
+              annexPaths.push(data.data)
+              measureRoomList[index]['measureAnnex'] = annexPaths;
+              _this.setData({
+                measureRoomList: measureRoomList
+              })
+            }
+          },
+        })
+      })
+    },
   /**
  * @desc : 空间删除
  * @date : 2024/2/1 15:49
@@ -124,7 +171,7 @@ Page({
    * @author : 于继渤
    */
   setCus(formData, item) {
-    formData.cusId = item.cusId
+    formData['cusId'] = item.cusId ? item.cusId : null
     formData.cusName = item.cusName
     formData.cusCode = item.cusCode
     formData.cusPhone = item.cusPhone
@@ -145,11 +192,99 @@ Page({
     formData.followId = item.followId
     return JSON.stringify(formData)
   },
+  /**
+     * @desc : 给表单赋值
+     * @date : 2024/2/1 15:49
+     * @author : 于继渤
+     */
+  setValuesByEdit(data) {
+    if (this.data.formType == Constants.formMode.detail) {
+      this.setCoums()
+      let formData = JSON.parse(this.data.formData)
+      console.log(data)
+     let measureReceipt =  data.measureReceipt
+      //处理量尺下信息
 
+      formData.measureRemarks = measureReceipt.measureRemarks
+     
+      formData.measureTime = measureReceipt.measureTime
+      formData.flgAgainMeasure = measureReceipt.flgAgainMeasure
+      formData.cusName = data.cusName
+      formData.cusCode = data.cusCode
+      formData.cusPhone = data.cusPhone
+      //不这么设置 会不回显
+      formData.address = {
+        address: data.addressFull,
+        addressFull: data.addressFull,
+        addressArea: data.addressArea,
+        addressGcj02: data.addressGcj02,
+        addressName: data.addressName,
+      }
+      formData.addressArea = data.addressArea
+      formData.addressFull = data.addressFull
+      formData.addressGcj02 = data.addressGcj02
+      formData.addressName = data.addressName
+      formData.addressNo = data.addressNo
+      formData.staffName = data.staffName
+      formData.staffId = data.staffId
+      data.measureRoomList.forEach(res=>{
+        res.readonly = true
+      })
+     
+      this.setData({
+        formData: JSON.stringify(formData),
+        measureRoomList:data.measureRoomList,
+      })
+    }
 
+  },
 
 
+  setCoums() {
+    let contentObj = this.data.contentObj
+    contentObj.main = [
+      { code: 'cusName', type: 'str', required: false, title: mixins.$t('customerName'), readonly: true },
+      { code: 'cusPhone', type: 'str', required: false, title: mixins.$t('cusPhone'), readonly: true },
+      { code: 'addressFull', type: 'str', required: false, title: mixins.$t('addressFull'), readonly: true },
+      { code: 'addressNo', type: 'str', required: false, title: mixins.$t('addressNo'), readonly: true },
+      { code: 'staffName', type: 'str', required: false, title: mixins.$t('sales'), readonly: true },
+      // { code: 'flgAgainMeasure', type: 'str', required: false, title: mixins.$t('flgAgainMeasure'),readonly:true  },
+      { code: 'flgAgainMeasure', type: 'checkedBox', required: false, title: mixins.$t('flgAgainMeasure'), readonly: false },
+      { code: 'measureRemarks', type: 'str', required: false, title: mixins.$t('measureRemarks'), readonly: true },
+      { code: 'measureTime', type: 'str', required: false, title: mixins.$t('measureTime'), readonly: true },
 
+    ]
+    this.setData({
+      contentObj: contentObj
+    })
+  },
+  /**
+  * @desc : 编辑
+  * @date : 2024/2/1 15:49
+  * @author : 于继渤
+  */
+  toEdit() {
+    let item = JSON.parse(this.data.formData)
+    let url = this.data.route.toFollowStatus3.url
+
+    let _this = this;
+    wx.navigateTo({
+      url: url,
+      events: {
+        // 保存成功后刷新页面
+        refresh: function (data) {
+          // 刷新一览界面
+          _this.searchData();
+        }
+      },
+      success: function (res) {
+        let data = {}
+        data.id = item.followId
+        data.formMode = Constants.formMode.edit
+        res.eventChannel.emit('params', data);
+      }
+    })
+  },
   /**
    * 生命周期函数--监听页面加载
    */
@@ -164,6 +299,7 @@ Page({
       that.setData({
         formData: formData
       })
+
     })
   },
 

package-basic-data/pages/customer-reception/measure-to/measure-to.wxml

@@ -12,7 +12,16 @@
           <van-field value="{{ item.roomName }}" custom-style="background:#F8F9FD;border-radius:15rpx 15rpx 0 0;" label="{{$t['spaceName']}}"  label-class="nomal-label" data-index="{{index}}" placeholder="{{$t['pleaseEnterTheSpaceName']}}" input-align="right" bind:change="onRoomNameChange" errorMessage="{{item.errMsg}}" />
           <view style=" width:100%;">
             <view style="padding:38rpx;background: #F8F9FD;border-radius:0 0 15rpx 15rpx;">
-              <van-uploader prefix="{{prefixUrl}}" preview-size="15vw" accept="image" file-list="{{ item.annexPaths}}" bind:delete="deleteImg" bind:after-read="afterRead" data-index="{{index}}" multiple="true" imageFit="cover">
+              <!-- <van-uploader prefix="{{prefixUrl}}" preview-size="15vw" accept="image" file-list="{{ item.annexPaths}}" bind:delete="deleteImg" bind:after-read="afterRead" data-index="{{index}}" multiple="true" imageFit="cover">
+                <view slot="preview-cover">
+                </view>
+                <view class="upload-view">
+                  <van-icon name="plus" color="#606EB2" style="font-family: 'PingFang SC';font-size: 20px;font-weight: 600;" />
+                  <view>{{$t['uploadDrawings']}}</view>
+                </view>
+              </van-uploader> -->
+
+              <van-uploader max-count="5" disabled="{{item.readonly}}" accept="image" style="margin-left: 4%;border-radius: 15rpx;" preview-size="160rpx;" file-list="{{ item.measureAnnex }}" bind:delete="deleteImg" bind:after-read="afterRead" data-index="{{index}}" multiple="true" imageFit="aspectFit" max-size="{{maxSize}}" bind:oversize="overSize" >
                 <view slot="preview-cover">
                 </view>
                 <view class="upload-view">
@@ -29,7 +38,7 @@
   </view>
 
 
-  <view style="margin-top: 30rpx;">
+  <view style="margin-top: 30rpx;"  wx:if="{{formType !=='detail'}}">
     <van-button size="small" custom-style="font-weight: 400;font-family: 'PingFang SC';font-size: 14px;color:#606EB2;border:0;border-radius:15rpx;box-shadow: 0rpx 10rpx 20rpx rgba(225, 229, 238, 0.6);height:70rpx;" icon="plus" bind:click="addItem" block>
       {{$t['addDrawings']}}
     </van-button>
@@ -40,4 +49,15 @@
 
 
 <view style="height: 200rpx;"></view>
-<dk-save-button model:value="{{btnFormData}}" btnAutoWidthFlag="{{true}}" btnRightFlag="{{true}}" buttonList="{{buttonSaveList}}" contentList="{{contentSaveList}}" bind:open="save"></dk-save-button>
+
+
+
+<view style="position: fixed;bottom: 230rpx;right: 30rpx;" wx:if="{{formType =='detail'}}">
+  <view bind:tap="toEdit" class="btn-add-class-2">
+    <van-icon name="edit" color="#FFFFFF" size="60rpx" />
+  </view>
+</view>
+
+
+
+<dk-save-button wx:if="{{formType !=='detail'}}"  model:value="{{btnFormData}}" btnAutoWidthFlag="{{true}}" btnRightFlag="{{true}}" buttonList="{{buttonSaveList}}" contentList="{{contentSaveList}}" bind:open="save"></dk-save-button>

package-basic-data/pages/customer-reception/measure-to/measure-to.wxss

@@ -8,7 +8,15 @@
   align-items: initial;
   justify-content: center;
 }
-
+.btn-add-class-2 {
+	background: #8091A9;
+	border-radius: 50%;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	padding: 20rpx;
+	box-shadow: 0px 17px 22px 0px #1B365D33;
+}
 .upload-view>view:nth-child(2){
   font-style: normal;
   font-weight: 400;

pages/home-page/home-page.wxml

@@ -29,7 +29,7 @@
 <view style="height: 340rpx; "></view>
 
 <!-- 商品相关 功能卡片-->
-<view>
+<view style="z-index: 10;">
   <!-- 应用 -->
   <view>
     <view style="background: #fff;border-radius: 15rpx;">