Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss_wx_app

api/pages/mst/cusFollow.js

@@ -12,6 +12,7 @@ module.exports = {
     // 前缀
     prefix: 'mdm-server/mst/cusFollow/',
     selectByList: 'select_by_list',
+    saveMeasure: 'save_measure',
     updateMeasure: 'update_measure'
   },
   routeUrl: {

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

@@ -56,52 +56,52 @@ Page({
       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 : 上传附件
+   * @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
@@ -160,7 +160,13 @@ Page({
     * @author : 于继渤
     */
   saveData() {
-    return this.excute(this.data.service, this.data.service.updateMeasure, this.data.params);
+    if (this.data.formMode == Constants.formMode.edit) {
+      return this.excute(this.data.service, this.data.service.updateMeasure, this.data.params);
+    } else {
+      return this.excute(this.data.service, this.data.service.saveMeasure, this.data.params);
+    }
+
+
   },
 
 
@@ -198,62 +204,79 @@ Page({
      * @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=>{
+    this.setCoums()
+    let formData = JSON.parse(this.data.formData)
+    let measureReceipt = data.measureReceipt
+    //处理量尺下信息
+    formData.followId = data.followId
+    formData.measureRemarks = measureReceipt.measureRemarks
+    formData.receiptId = measureReceipt.receiptId
+
+    formData.measureTime = measureReceipt.measureTime
+    formData.flgAgainMeasure = measureReceipt.flgAgainMeasure
+    formData.cusName = data.cusName
+    formData.cusCode = data.cusCode
+    formData.cusId = data.cusId
+    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
+    if (this.data.formType == Constants.formMode.detail) {
+      data.measureRoomList.forEach(res => {
         res.readonly = true
       })
-     
-      this.setData({
-        formData: JSON.stringify(formData),
-        measureRoomList:data.measureRoomList,
-      })
     }
 
+
+    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 },
+    if (this.data.formType == Constants.formMode.detail) {
+      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 },
+
+      ]
+    }else{
+      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: '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') },
+
+      ]
+    }
 
-    ]
     this.setData({
       contentObj: contentObj
     })
@@ -266,7 +289,7 @@ Page({
   toEdit() {
     let item = JSON.parse(this.data.formData)
     let url = this.data.route.toFollowStatus3.url
-
+    console.log(item)
     let _this = this;
     wx.navigateTo({
       url: url,