试用申请bug修复

app.json

@@ -95,7 +95,8 @@
                 "select/task/index",
                 "calendar/index",
                 "calendar/task/index",
-                "calendarN/index"
+                "calendarN/index",
+                "calendar/task/detail"
             ]
         },
         {

components/Yl_field/index.js

@@ -297,6 +297,7 @@ Component({
     },
     /* 单选 选择器改变 */
     radioChange(e) {
+      console.log(e,'输出111')
       let item = e.currentTarget.dataset.item,
         index = this.data.form.findIndex(v => v.valueName == item.valueName);
       if (this.data.form[index].value == e.detail) return;
@@ -304,6 +305,8 @@ Component({
         [`form[${index}].value`]: e.detail,
         [`form[${index}].error`]: false,
       });
+      this.confirm();
+      console.log(item.interrupt,this.data.form[index],this.data.form,item)
       if (item.interrupt) this.triggerEvent("interrupt", {
         data: this.data.form[index],
         form: this.data.form,
@@ -312,7 +315,7 @@ Component({
           index
         }
       });
-      this.confirm();
+      
     },
     /* 提交 */
     submit() {

components/personnel/index.js

@@ -1,185 +1,198 @@
 const _Http = getApp().globalData.http;
 Component({
-    properties: {
-        isdep: {
-            type: Boolean,
-            value: true
-        },
-        isusers: {
-            type: Boolean,
-            value: true
-        },
-        defaultMy: {
-            type: Boolean,
-            value: true
-        },
-        exclution: {
-            type: Boolean,
-            value: true
-        },
-        dimissionF: {
-            type: Boolean
-        },
-        defaultIsleave: {
-            type: [Number, String],
-            value: 0
-        }
+  properties: {
+    isdep: {
+      type: Boolean,
+      value: true
     },
-    data: {
-        takeEffect: "", //生效筛选项
-        result: {
-            name: ""
-        },
-        users: {
-            active: {}
-        },
-        isleave: 1,
-        tabs: [{
-            value: 0,
-            name: "全部"
-        }, {
-            value: 1,
-            name: "在职"
-        }, {
-            value: 2,
-            name: "离职"
-        }],
-        searchValue: "",
-        depGroud: []
+    isusers: {
+      type: Boolean,
+      value: true
     },
-    lifetimes: {
-        attached: function () {
-            getApp().globalData.Language.getLanguagePackage(this)
-        }
+    defaultMy: {
+      type: Boolean,
+      value: true
     },
-    methods: {
-
-      doSomething() {
-        console.log('personnel 方法被调用了！');
-        // 你的逻辑
-      },
-      getData() {
-        return { name: '张三' };
-      },
-
-
+    exclution: {
+      type: Boolean,
+      value: true
+    },
+    dimissionF: {
+      type: Boolean
+    },
+    defaultIsleave: {
+      type: [Number, String],
+      value: 0
+    }
+  },
+  data: {
+    takeEffect: "", //生效筛选项
+    result: {
+      name: ""
+    },
+    users: {
+      active: {}
+    },
+    isleave: 1,
+    tabs: [{
+      value: 0,
+      name: "全部"
+    }, {
+      value: 1,
+      name: "在职"
+    }, {
+      value: 2,
+      name: "离职"
+    }],
+    searchValue: "",
+    depGroud: []
+  },
+  lifetimes: {
+    attached: function () {
+      getApp().globalData.Language.getLanguagePackage(this)
+    }
+  },
+  methods: {
+    userList() {
+      const nowUserid = wx.getStorageSync('userMsg').userid
+      const userid = this.data.users.active != nowUserid ? this.data.users.active : nowUserid
 
-        searchChange({
-            detail
-        }) {
-          console.log('输出底层',detail)
-            if (detail.length == 0) return this.searchClear()
-            let list = JSON.parse(JSON.stringify(this.data.users.copyList));
-            this.setData({
-                'users.list': list.filter(v => v.name.includes(detail) || v.accountno.includes(detail))
-            })
-        },
-        searchClear() {
-            this.setData({
-                'users.list': JSON.parse(JSON.stringify(this.data.users.copyList))
-            })
-        },
-        changLeave(e) {
-            this.setData({
-                isleave: e.currentTarget.dataset.value,
-                'result.isleave': e.currentTarget.dataset.value
-            })
-            console.log("result", this.data.result)
-            this.initDepAndUser(false);
-        },
-        initDepAndUser(init = true) {
-            if (init) this.setData({
-                takeEffect: "", //生效筛选项
-                result: {},
-            })
-            let content = {
-                isleave: this.data.isleave
-            }
-            return new Promise((resolve) => {
-                _Http.basic({
-                    "id": 20230620102004,
-                    content
-                }).then(res => {
-                    console.log("获取部门", res)
-                    if (this.data.isdep && this.data.depGroud.length == 0) this.setData({
-                        depGroud: [{
-                            label: "部门",
-                            list: res.data.dep,
-                            active: ""
-                        }]
-                    })
-                    console.log("depGroud", this.data.depGroud)
-                    console.log("result", this.data.result)
-                    console.log("active", this.data.active)
+      console.log(wx.getStorageSync('userMsg').userid)
+      console.log(userid,'userid555')
+      this.setData({
+        'users.active':userid
+      })
+      _Http.basic({
+        "id": 2025122211095302,
+        "content": {}
+      }).then(res => {
+        console.log(res,'数据222')
+        res.data.unshift({
+          name:"我",
+          userid: 2800
+        })
+        this.setData({
+          'users.list':res.data
+        })
+      })
+    },
+    searchChange({
+      detail
+    }) {
+      console.log('输出底层', detail)
+      if (detail.length == 0) return this.searchClear()
+      let list = JSON.parse(JSON.stringify(this.data.users.copyList));
+      this.setData({
+        'users.list': list.filter(v => v.name.includes(detail) || v.accountno.includes(detail))
+      })
+    },
+    searchClear() {
+      this.setData({
+        'users.list': JSON.parse(JSON.stringify(this.data.users.copyList))
+      })
+    },
+    changLeave(e) {
+      this.setData({
+        isleave: e.currentTarget.dataset.value,
+        'result.isleave': e.currentTarget.dataset.value
+      })
+      console.log("result", this.data.result)
+      this.initDepAndUser(false);
+    },
+    initDepAndUser(init = true) {
+      if (init) this.setData({
+        takeEffect: "", //生效筛选项
+        result: {},
+      })
+      let content = {
+        isleave: this.data.isleave
+      }
+      return new Promise((resolve) => {
+        _Http.basic({
+          "id": 20230620102004,
+          content
+        }).then(res => {
+          console.log("获取部门", res)
+          if (this.data.isdep && this.data.depGroud.length == 0) this.setData({
+            depGroud: [{
+              label: "部门",
+              list: res.data.dep,
+              active: ""
+            }]
+          })
+          console.log("depGroud", this.data.depGroud)
+          console.log("result", this.data.result)
+          console.log("active", this.data.active)
 
-                    if (this.data.isusers) {
-                        let active = this.data.users.active;
-                        if (this.data.defaultMy && this.data.result.name == '') {
-                            let user = res.data.hr.find(v => v.userid == wx.getStorageSync('userMsg').userid)
-                            if (user) {
-                                active = user.userid;
-                                resolve(user)
-                                this.setData({
-                                    takeEffect: "user",
-                                    result: user
-                                })
-                            } else {
-                                this.setData({
-                                    takeEffect: "",
-                                    result: {}
-                                })
-                            }
-                        }
-                        this.setData({
-                            users: {
-                                label: "业务员",
-                                list: res.data.hr,
-                                copyList: res.data.hr,
-                                active
-                            }
-                        })
-                    }
-                    if (init) this.setData({
-                        isleave: this.data.defaultIsleave
-                    })
-                    resolve({})
+          if (this.data.isusers) {
+            let active = this.data.users.active;
+            if (this.data.defaultMy && this.data.result.name == '') {
+              let user = res.data.hr.find(v => v.userid == wx.getStorageSync('userMsg').userid)
+              if (user) {
+                active = user.userid;
+                resolve(user)
+                this.setData({
+                  takeEffect: "user",
+                  result: user
                 })
-            })
-        },
-        selectDep(e) {
-            const {
-                item,
-                index
-            } = e.currentTarget.dataset;
-            let depGroud = this.data.depGroud.slice(0, index + 1);
-            depGroud[index].active = item.sa_saleareaid;
-            if (item.subdep.length) {
-                item.subdep.unshift(JSON.parse(JSON.stringify(item)))
-                item.subdep[0].depname = getApp().globalData.Language.getMapText('全部');
-                item.subdep[0].subdep = [];
-                depGroud.push({
-                    label: item.depname + getApp().globalData.Language.getMapText('下级部门'),
-                    list: item.subdep,
-                    active: item.sa_saleareaid
+              } else {
+                this.setData({
+                  takeEffect: "",
+                  result: {}
                 })
+              }
             }
-            item.name = item.depname
-            item.isleave = this.data.isleave;
-            this.setData({
-                depGroud,
-                takeEffect: "dep",
-                result: item
-            })
-        },
-        selectUser(e) {
-            const {
-                item
-            } = e.currentTarget.dataset;
             this.setData({
-                'users.active': item.userid,
-                takeEffect: "user",
-                result: item
+              users: {
+                label: "业务员",
+                list: res.data.hr,
+                copyList: res.data.hr,
+                active
+              }
             })
-        },
-    }
+          }
+          if (init) this.setData({
+            isleave: this.data.defaultIsleave
+          })
+          resolve({})
+        })
+      })
+    },
+    selectDep(e) {
+      const {
+        item,
+        index
+      } = e.currentTarget.dataset;
+      let depGroud = this.data.depGroud.slice(0, index + 1);
+      depGroud[index].active = item.sa_saleareaid;
+      if (item.subdep.length) {
+        item.subdep.unshift(JSON.parse(JSON.stringify(item)))
+        item.subdep[0].depname = getApp().globalData.Language.getMapText('全部');
+        item.subdep[0].subdep = [];
+        depGroud.push({
+          label: item.depname + getApp().globalData.Language.getMapText('下级部门'),
+          list: item.subdep,
+          active: item.sa_saleareaid
+        })
+      }
+      item.name = item.depname
+      item.isleave = this.data.isleave;
+      this.setData({
+        depGroud,
+        takeEffect: "dep",
+        result: item
+      })
+    },
+    selectUser(e) {
+      console.log(e,'输出3333')
+      const {
+        item
+      } = e.currentTarget.dataset;
+      this.setData({
+        'users.active': item.userid,
+        takeEffect: "user",
+        result: item
+      })
+    },
+  }
 })

components/personnel/index.wxml

@@ -10,6 +10,10 @@
         </view>
     </view>
     <view class="content">
-        <van-button custom-class='but {{item.userid == users.active?" active":""}}' wx:for="{{users.list}}" wx:key="userid" data-item="{{item}}" bindtap="selectUser">{{item.name}} {{item.accountno}}</van-button>
+        <van-button custom-class='but {{item.userid == users.active?" active":""}}' 
+        wx:for="{{users.list}}" wx:key="userid" data-item="{{item}}" bindtap="selectUser">{{item.name}} {{item.userid}}</van-button>
     </view>
-</view>
+</view>
+
+
+<wxs src='../../utils/wxmlQueryPer.wxs' module="per" />

node_modules/.package-lock.json

@@ -0,0 +1,12 @@
+{
+  "name": "prsx-crm",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "node_modules/@vant/weapp": {
+      "version": "1.10.3",
+      "resolved": "https://registry.npmjs.org/@vant/weapp/-/weapp-1.10.3.tgz",
+      "integrity": "sha512-CcG5umI+zlJRN6hQXPeknOenPkVm6WBEgBaB6Y94kOmKLx9NHtHBdURwxuJEA4q4mxhUdOuf6sV7I8tZBnCVxw=="
+    }
+  }
+}

package-lock.json

@@ -1,8 +1,14 @@
 {
+  "name": "prsx-crm",
+  "lockfileVersion": 3,
   "requires": true,
-  "lockfileVersion": 1,
-  "dependencies": {
-    "@vant/weapp": {
+  "packages": {
+    "": {
+      "dependencies": {
+        "@vant/weapp": "^1.10.3"
+      }
+    },
+    "node_modules/@vant/weapp": {
       "version": "1.10.3",
       "resolved": "https://registry.npmjs.org/@vant/weapp/-/weapp-1.10.3.tgz",
       "integrity": "sha512-CcG5umI+zlJRN6hQXPeknOenPkVm6WBEgBaB6Y94kOmKLx9NHtHBdURwxuJEA4q4mxhUdOuf6sV7I8tZBnCVxw=="

prsx/calendar/index.js

@@ -313,10 +313,27 @@ Page({
     this.setData({
       showFiltrate:true
     })
+    let page = this.selectComponent("#personnel")
+    page.userList()
   },
   handleFilter({
     detail
   }){
     console.log('shuchu',detail)
+    let page = this.selectComponent("#personnel")
+    console.log(page.data.result,'555')
+    console.log(page.data.users.active,'输出active')
+    this.setData({
+      canlendar_name:page.data.result.name,
+      userid:page.data.result.userid
+    })
+    this.prevData()
+  },
+  taskSelect(item){
+    console.log('选中',item)
+    let data = item.currentTarget.dataset.data
+    wx.navigateTo({
+      url: '/prsx/calendar/task/detail?id=' + data.sys_taskid
+  })
   }
 });

prsx/calendar/index.scss

@@ -120,11 +120,11 @@
 }
 
 .section {
-  margin: 20rpx;
   background-color: white;
   border-radius: 10rpx;
   padding: 20rpx;
   box-shadow: 0 2rpx 10rpx rgba(0,0,0,0.1);
+  margin: 20rpx 10rpx 20rpx 10rpx;
 }
 
 .section-title {
@@ -176,6 +176,7 @@
 .calendar-container {
   padding: 0rpx;
   background-color: #f5f5f5;
+  margin-bottom: 50rpx;
 }
 
 .calendar-header {
@@ -282,4 +283,34 @@
   display: flex;
   justify-content: space-between;
   margin-bottom: 10rpx;
+}
+
+
+.footer {
+  display: flex;
+  justify-content: space-around;
+  width: 100%;
+  box-sizing: border-box;
+  padding: 10rpx;
+  box-shadow: rgba(0, 0, 0, 0.1) 0px -2px 8rpx;
+
+  .v-but {
+      width: 190rpx;
+      height: 90rpx;
+      background: #FFFFFF;
+      border-radius: 8rpx;
+      border: 1px solid #CCCCCC;
+      font-size: 28rpx;
+      font-family: PingFang SC-Regular, PingFang SC;
+      color: #666666;
+  }
+
+  .confirm {
+      border: none;
+      background: #3874F6;
+      font-size: 28rpx;
+      font-family: PingFang SC-Bold, PingFang SC;
+      font-weight: bold;
+      color: #FFFFFF;
+  }
 }

prsx/calendar/index.wxml

@@ -45,7 +45,7 @@
       <view class="section-title">任务</view>
       <view class="section-date">{{ selectedDate }}</view>
     </view>
-    <view wx:for="{{ taskData }}" wx:key="id" class="task-item">
+    <view wx:for="{{ taskData }}" wx:key="id" class="task-item" data-data="{{ item }}" bindtap="taskSelect">
       <text class="task-text">{{ item.title }}</text>
     </view>
   </view>
@@ -65,7 +65,10 @@
 <!-- 浮动按钮 -->
 <Yl_FloatingButton bindtap="onSelect" />
 <van-action-sheet show="{{ actionShow }}" actions="{{ types }}" cancel-text="{{language['取消']||'取消'}}" bind:select='selectType' bind:cancel='onCancel' bind:click-overlay='onCancel' />
+
+
+
 <!-- <organization slot='head' defaultIsleave='1' dimissionF id='organization' /> -->
-<Yl_Filtrate1 id="Yl_Filtrate1" show='{{showFiltrate}}' list="{{[]}}" bindhandle="handleFilter">
-  <personnel id="personnel" />
+<Yl_Filtrate1 id="Yl_Filtrate1" show='{{showFiltrate}}' list="{{[]}}" bindhandle="handleFilter" isReset="{{false}}">
+  <personnel id="personnel"  />
 </Yl_Filtrate1>

prsx/calendar/task/detail.js

@@ -0,0 +1,239 @@
+const _Http = getApp().globalData.http
+Page({
+    data: {
+        loading: true,
+        isLeader: false, //是否为负责人
+        tabsActive: 0, //tabs 选中项
+        sys_taskid: 0,
+        sColors: getApp().globalData.sColors
+    },
+    onLoad(options) {
+        const appAuth = wx.getStorageSync('auth').wdoctors;
+
+        let tabsList = [{
+            label: "附件",
+            icon: "icon-tabfujian1",
+            model: "#Files"
+        }, {
+            label: "操作",
+            icon: "icon-tabcaozuojilu1",
+            model: "#Record"
+        }];
+        if (appAuth.isdatafollowup) {
+            tabsList.unshift({
+                label: "跟进动态",
+                icon: "icon-tabgenjinjilu",
+                model: "#Trace"
+            })
+        }
+        console.log("appAuth", appAuth)
+        this.setData({
+          sys_taskid: options.id,
+            tabsList,
+            appAuth
+        })
+        this.getDetail();
+        getApp().globalData.Language.getLanguagePackage(this);
+    },
+
+    /* 获取详情 */
+    getDetail() {
+        /* 基本信息 */
+        _Http.basic({
+            "id": 2025122210022002,
+            "content": {
+              sys_taskid: this.data.sys_taskid
+            },
+        }).then(res => {
+            console.log("详情", res)
+            if (res.code != '1') return wx.showToast({
+                title: res.data,
+                icon: "none"
+            })
+            this.setPreview(res);
+            this.setData({
+                loading: false,
+                detail: res.data,
+            })
+            let page = this.selectComponent("#Trace")
+            page.getList("", true)
+            //获取标签
+            // this.setTabbar();
+            // this.partialRenewal();
+        });
+    },
+
+    setPreview(res) {
+        /* 摘要信息 */
+        let briefs = [];
+
+        this.setData({
+            briefs,
+        });
+    },
+    //详情按钮回调
+    tabbarOnClick({
+        detail
+    }) {
+        let data = JSON.parse(JSON.stringify(this.data.detail)),
+            that = this;
+        switch (detail.label) {
+            case "编辑":
+                data.sa_customersid = data.enterprisename ? [data.enterprisename, [data.sa_customersid]] : "";
+                wx.navigateTo({
+                    url: `/prsx/doctors/insert?data=${JSON.stringify(data)}`,
+                })
+                break;
+            case "跟进":
+                that.selectComponent("#Trace").toAdd()
+                break;
+            case "删除":
+                wx.showModal({
+                    content: `是否确定删除'${data.hospitaldepname}'?`,
+                    complete: (res) => {
+                        if (res.confirm) _Http.basic({
+                            "content": {
+                                "sys_taskid": data.sys_taskid
+                            },
+                            "id": 2025102116480402
+                        }).then(res => {
+                            console.log("删除医生", res)
+                            wx.showToast({
+                                title: res.code != '1' ? res.msg : '删除成功',
+                                icon: "none",
+                                mask: res.code == '1'
+                            })
+                            if (res.code != '1') return;
+                            setTimeout(() => {
+                                wx.navigateBack()
+                            }, 300)
+                        })
+                    }
+                })
+                break;
+            case "更换负责人":
+                wx.navigateTo({
+                    url: `/pages/group/select?data=${JSON.stringify({
+                         ownertable:"sa_doctor",
+                         ownerid:this.data.sys_taskid,
+                    })}&radio=true&principal=true`,
+                })
+                break;
+            default:
+                console.log(detail)
+                break;
+        }
+    },
+    /* 更换负责人 */
+    handelSubmit(arr) {
+        const that = this;
+        wx.showModal({
+            title: getApp().globalData.Language.getMapText('提示'),
+            content: getApp().globalData.Language.getMapText('是否确认更换负责人'),
+            complete: ({
+                confirm
+            }) => {
+                if (confirm) wx.showModal({
+                    title: getApp().globalData.Language.getMapText('提示'),
+                    content: getApp().globalData.Language.getMapText('是否参与该数据的后续工作'),
+                    cancelText: getApp().globalData.Language.getMapText('不参与'),
+                    confirmText: getApp().globalData.Language.getMapText('参与'),
+                    complete: (s) => {
+                        _Http.basic({
+                            "id": 20220930103701,
+                            "content": {
+                                ownertable: "sa_doctor",
+                                ownerid: that.data.sys_taskid,
+                                userid: arr[0],
+                                isaddoldleader: s.confirm ? 1 : 0
+                            }
+                        }).then(res => {
+                            console.log("更换负责人", res)
+                            if (res.code != '1') return wx.showToast({
+                                title: res.data,
+                                icon: "none"
+                            });
+                            wx.showToast({
+                                title: getApp().globalData.Language.getMapText('更换成功'),
+                                icon: "none",
+                                mask: true
+                            });
+                            getCurrentPages().forEach(v => {
+                                if (['packageA/setclient/index'].includes(v.__route__)) v.getList(true)
+                            })
+                            setTimeout(() => {
+                                wx.navigateBack({
+                                    delta: 2
+                                });
+                            }, 300)
+                        })
+                    }
+                })
+            }
+        })
+    },
+    //tabs 切换
+    tabsChange({
+        detail
+    }) {
+        this.setData({
+            tabsActive: detail
+        });
+        this.partialRenewal();
+    },
+    //局部数据更新 tabs
+    partialRenewal(init = false) {
+        let model = this.data.tabsList[this.data.tabsActive].model;
+        if (model) {
+            let Component = this.selectComponent(model),
+                {
+                    total,
+                    pageNumber,
+                    pageTotal
+                } = Component.data.content,
+                id = model == "#Clue" ? this.data.detail.sys_taskid : this.data.detail.sys_enterpriseid;
+            if (model == "#Files") init = true;
+            if (total == null || init) {
+                Component.getList(id, init);
+            } else if (pageNumber <= pageTotal) {
+                Component.getList(id, false);
+            }
+        }
+    },
+    //更新标签
+    getTags() {
+        this.selectComponent("#Tags").getTags()
+    },
+    //更新团队成员
+    getGroup() {
+        this.selectComponent("#Group").getList().then(this.setTabbarList)
+    },
+    onReachBottom() {
+        this.partialRenewal();
+    },
+    onUnload() {
+        getCurrentPages().forEach(page => {
+            if (page.__route__ == 'prsx/doctors/index') {
+                let content = JSON.parse(JSON.stringify(page.data.content));
+                content.pageSize = (content.pageNumber - 1) * content.pageSize;
+                content.pageNumber = 1;
+                _Http.basic({
+                    id: '2025102208523002',
+                    content
+                }).then(res => {
+                    console.log("更新医生列表", res);
+                    if (res.code == '1') {
+                        page.setData({
+                            list: res.data,
+                            "content.total": res.total
+                        })
+                    }
+                })
+            } else if (page.__route__ == 'prsx/department/detail') {
+                page.selectComponent("#Doctors").getList(page.data.detail.sa_hospitaldepid, true)
+            } else if (page.__route__ == 'prsx/hospital/detail') {
+                page.selectComponent("#Doctors").getList('', true)
+            }
+        })
+    }
+})

prsx/calendar/task/detail.json

@@ -0,0 +1,6 @@
+{
+  "usingComponents": {
+      "Trace": "/prsx/trace/index"
+  },
+  "navigationBarTitleText": "任务详情"
+}

prsx/calendar/task/detail.scss

@@ -0,0 +1,66 @@
+.setclient-list-item {
+	width: 100vw;
+	background-color: #fff;
+	box-sizing: border-box;
+
+	.con {
+		padding-left: 30rpx;
+		display: flex;
+		width: 100%;
+		box-sizing: border-box;
+		padding-top: 20rpx;
+
+		.mian {
+			flex: 1;
+			width: 0;
+			padding-right: 20rpx;
+			box-sizing: border-box;
+
+			.label {
+				font-size: 28rpx;
+				font-family: PingFang SC-Bold, PingFang SC;
+				font-weight: bold;
+				color: #333333;
+				height: 40rpx;
+				line-height: 40rpx;
+			}
+
+			.tag-box {
+				margin-top: 10rpx;
+
+				.tag {
+					height: 40rpx;
+					font-size: 20rpx;
+					font-family: PingFang SC-Regular, PingFang SC;
+					padding: 0 12rpx;
+					margin-right: 8rpx;
+				}
+			}
+		}
+
+		.icon {
+			display: flex;
+			height: 136rpx;
+			align-items: center;
+			margin-top: -20rpx;
+			color: #CFCFCF;
+			width: 28rpx;
+			margin-right: 30rpx;
+			flex-shrink: 0;
+		}
+
+		.extend {
+			display: flex;
+			height: 116rpx;
+			width: 48rpx;
+			margin-right: 30rpx;
+			flex-shrink: 0;
+		}
+	}
+}
+
+.line-1 {
+	overflow: hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+}

prsx/calendar/task/detail.wxml

@@ -0,0 +1,26 @@
+<view class="setclient-list-item" url="#">
+    <view class="con">
+        <view class="mian">
+            <view class="label line-1" style="font-size: 35rpx;">{{detail.title}}</view>
+            <view style="margin-top: 20rpx;color: rgb(194, 188, 188);font-size: 26rpx;">{{detail.taskdate}}</view>
+            <view style="margin-top: 20rpx;">{{detail.contenttext}}</view>
+        </view>
+    </view>
+</view>
+<view style="margin-top: -16rpx;">
+    <Yl_Detail list="{{briefs}}">
+      <view>{{detail.taskdate}}</view>
+    </Yl_Detail>
+</view>
+<view style="height: 20rpx;" />
+<!-- 功能 -->
+<Yl_FunTabs list='{{tabsList}}' active='{{tabsActive}}' bind:onChenge="tabsChange">
+    <!-- <Preview slot='详细信息' list1='{{list1}}' list2='{{list2}}' /> -->
+    <Trace resource="行事历" slot='跟进动态' id='Trace' ownertable='sys_task' ownerid='{{sys_taskid}}' disabled="{{false}}"  />
+    <Record slot="操作" id="Record" ownertable='sys_task' ownerid='{{sys_taskid}}' />
+    <Files slot="附件" id="Files" ownertable='sys_task' ownerid='{{sys_taskid}}' disabled="{{detail.status != '已终止'}}" />
+</Yl_FunTabs>
+<view style="height: 80rpx;" />
+<!-- 底部 -->
+<!-- <Yl_Tabbar wx:if="{{tabbarList.length}}" list='{{tabbarList}}' bind:callback="tabbarOnClick" /> -->
+<wxs src='../../utils/wxmlQueryPer.wxs' module="per" />

prsx/calendarN/index.js

@@ -4,87 +4,72 @@ Component({
 
   },
   data: {
-      tasks: [{
-              id: 1,
-              title: '参加扬州大学附属医院产品推介会',
-              date: '2025-12-15'
-          },
-          {
-              id: 2,
-              title: '跟台上海天伦医院手术3场',
-              date: '2025-12-15'
-          }
-      ],
-      records: [{
-              id: 1,
-              title: '参加扬州大学附属医院产品推介会',
-              date: '2025-12-15'
-          },
-          {
-              id: 2,
-              title: '跟台上海天伦医院手术3场',
-              date: '2025-12-15'
-          }
-      ],
-      nowDate:'',
-      markers:[],
-      markDates: ['2026-01-10', '2026-01-15']
+    nowDate: '',
+    markers: [],
   },
   methods: {
-      handleCalendarLoad(e) {
-          // 1. 拿到今日日期 把年月记录到data中
-          // 2. 获取当月数据给日期打标记
-          // 3. 获取当日数据
-          let page = this.selectComponent("#calendar")
-          console.log("加载", e)
-          let date = e.detail.date
-          let nowDate = this.formatDate(date.year,date.month,date.day)
-          this.setData({
-            nowDate
-          })
-          console.log(this.data.nowDate)
-      },
-      handleCalendarDateChange(e) {
-          console.log("切换日期", e)
-          let date = e.detail.date
-          _Http.basic({
-            "id": "2025122210193402",
-            content:{
-              "year": date.year,
-              "month": date.month,
-              "taskUserid": 2800,
-            }
-        }).then(res => {
-          console.log('获取日期',res.data)
-          let obj = res.data
-          let arry = []
-          for (let key in obj) {
-            if (obj.hasOwnProperty(key)) { 
-              console.log(key);
-              console.log(obj[key])
-              if ( (obj[key].follow && obj[key].follow.length > 0) ||  (obj[key].task && obj[key].task.length > 0)) {
-                arry.push({
-                  year:new Date(key).getFullYear(),
-                  month:String(new Date(key).getMonth() + 1).padStart(2, '0'),
-                  day:String(new Date(key).getDate()).padStart(2, '0'),
-                  type:'schedule',
-                  mark:'试一下',
-                  color:'#2a97ff',
-                  bgColor:'#cce6ff'
-                })
-              }
+    handleCalendarLoad(e) {
+      // 1. 拿到今日日期 把年月记录到data中
+      // 2. 获取当月数据给日期打标记
+      // 3. 获取当日数据
+      let page = this.selectComponent("#calendar")
+      console.log("加载", e)
+      let date = e.detail.date
+      let nowDate = this.formatDate(date.year, date.month, date.day)
+      this.setData({
+        nowDate
+      })
+      console.log(this.data.nowDate)
+    },
+    handleCalendarDateChange(e) {
+      console.log("切换日期", e)
+      let date = e.detail.date
+      _Http.basic({
+        "id": "2025122210193402",
+        content: {
+          "year": date.year,
+          "month": date.month,
+          "taskUserid": 2800,
+        }
+      }).then(res => {
+        console.log('获取日期', res.data)
+        let obj = res.data
+        let arry = []
+        for (let key in obj) {
+          if (obj.hasOwnProperty(key)) {
+            console.log(key);
+            console.log(obj[key])
+            const item = obj[key];
+            const hasFollow = Array.isArray(item.follow) && item.follow.length > 0;
+            const hasTask = Array.isArray(item.task) && item.task.length > 0;
+            if (hasFollow || hasTask) {
+              const date = new Date(key);
+              // 优先任务颜色
+              const isTask = hasTask;
+              arry.push({
+                year: date.getFullYear(),
+                month: date.getMonth() + 1, // number
+                day: date.getDate(), // number
+                type: 'corner', // 或 'schedule'
+                text: '●',
+                style: {
+                  color: isTask ? '#f5222d' : '#1890ff',
+                  fontSize: '10px'
+                }
+              })
             }
           }
-          console.log(arry,'arry888')
-          this.setData({
-            markers:arry
-          })
+        }
+        // console.log(arry, 'arry888')
+        this.setData({
+          markers: arry
         })
-          // 1. 获取当日数据  
-          // 2. 判断选中日的年月是否与data中的相同；不相同获取当月数据打标记
-      },
-      formatDate(y,m,d){
-        return `${y}-${String(m).padStart(2, '0')}-${String(d).padStart(2, '0')}`;
-      }
+      })
+      // 1. 获取当日数据  
+      // 2. 判断选中日的年月是否与data中的相同；不相同获取当月数据打标记
+    },
+    formatDate(y, m, d) {
+      return `${y}-${String(m).padStart(2, '0')}-${String(d).padStart(2, '0')}`;
+    }
   }
 })

prsx/calendarN/index.wxml

@@ -1,5 +1,5 @@
 <view class="">
-	<calendar id="calendar" _vibrate='{{false}}' view='month' user_show='{{true}}' bindload="handleCalendarLoad" binddatechange="handleCalendarDateChange"  _markers="{{markers}}">
+	<calendar id="calendar" _vibrate='{{false}}' view='month' user_show='{{true}}' bindload="handleCalendarLoad" binddatechange="handleCalendarDateChange"  marks="{{markers}}">
 
 		<!-- 任务列表 -->
 		<view class="section">

prsx/dealer/detail.wxml

@@ -17,7 +17,7 @@
 <!-- 功能 -->
 <Yl_FunTabs list='{{tabsList}}' active='{{tabsActive}}' bind:onChenge="tabsChange">
     <Preview slot='详细信息' list1='{{list1}}' list2='{{list2}}' />
-    <Trace resource='经销商管理' slot='跟进动态' id='Trace' ownertable='sa_agents' ownerid='{{sys_enterpriseid}}' disabled="{{detail.status != '已终止'}}" ownerid1='{{detail.sa_agentsid}}' />
+    <Trace resource='经销商管理' slot='跟进动态' id='Trace' ownertable='sa_agents' ownerid='{{detail.sa_agentsid}}' disabled="{{false}}" ownerid1='{{detail.sa_agentsid}}' />
     <Salesperson slot='授权业务员' id="Salesperson" disabled="{{per.query(appAuth.options,'salesAuth')}}"></Salesperson>
     <Department slot='科室' id='Department'></Department>
     <Hospital slot='医院' id='Hospital'></Hospital>

prsx/department/detail.wxml

@@ -17,7 +17,7 @@
 <!-- 功能 -->
 <Yl_FunTabs list='{{tabsList}}' active='{{tabsActive}}' bind:onChenge="tabsChange">
     <Preview slot='详细信息' list1='{{list1}}' list2='{{list2}}' />
-    <Trace resource='科室管理' slot='跟进动态' id='Trace' ownertable='sa_hospitaldep' ownerid='{{sa_hospitaldepid}}' ownerid1='{{detail.sys_enterpriseid}}' />
+    <Trace resource='科室管理' slot='跟进动态' id='Trace' disabled="{{false}}"  ownertable='sa_hospitaldep' ownerid='{{sa_hospitaldepid}}' ownerid1='{{detail.sys_enterpriseid}}' />
     <Doctors slot="医生" id='Doctors' disabled="{{isLeader && isAdmin}}"/>
     <Product slot="推荐产品" id='Product' disabled="{{isLeader && isAdmin}}" />
     <Dealer slot="关联经销商" id='Dealer' disabled="{{isLeader && isAdmin}}" />

prsx/doctors/detail.wxml

@@ -18,7 +18,7 @@
 <!-- 功能 -->
 <Yl_FunTabs list='{{tabsList}}' active='{{tabsActive}}' bind:onChenge="tabsChange">
     <Preview slot='详细信息' list1='{{list1}}' list2='{{list2}}' />
-    <Trace resource='医生管理' slot='跟进动态' id='Trace' ownertable='sa_doctor' ownerid='{{sa_doctorid}}' disabled="{{detail.status != '已终止'}}" ownerid1='{{detail.sys_enterpriseid}}' />
+    <Trace resource='医生管理' slot='跟进动态' id='Trace' ownertable='sa_doctor' ownerid='{{sa_doctorid}}' disabled="{{false}}" ownerid1='{{detail.sys_enterpriseid}}' />
     <Record slot="操作" id="Record" ownertable='sa_doctor' ownerid='{{sa_doctorid}}' />
     <Files slot="附件" id="Files" ownertable='sa_doctor' ownerid='{{sa_doctorid}}' disabled="{{detail.status != '已终止'}}" />
 </Yl_FunTabs>

prsx/hospital/detail.wxml

@@ -16,7 +16,7 @@
 <view style="height: 20rpx;" />
 <!-- 功能 -->
 <Yl_FunTabs list='{{tabsList}}' active='{{tabsActive}}' bind:onChenge="tabsChange">
-  <Trace resource='医院管理' slot='跟进动态' id='Trace' ownertable='sa_customers' ownerid='{{sa_customersid}}' disabled="{{detail.status != '已终止'}}" ownerid1='{{detail.sys_enterpriseid}}' />
+  <Trace resource='医院管理' slot='跟进动态' id='Trace' ownertable='sa_customers' ownerid='{{sa_customersid}}' disabled="{{false}}" ownerid1='{{detail.sys_enterpriseid}}' />
     <Preview slot='详细信息' list1='{{list1}}' list2='{{list2}}' />
     <Department slot='科室' id='Department' disabled="{{isLeader}}" />
     <Doctors slot='医生' id='Doctors' disabled="{{isLeader}}" />

prsx/select/task/index.wxml

@@ -11,7 +11,7 @@
 				<text>{{item.contenttext}}</text>
 			</view>
 			<view class="replenish1">
-				<text>{{item.begindate + '至' + item.enddate}}</text>
+				<text>{{item.begindate}}</text>
 			</view>
 		</view>
 	</navigator>

prsx/trace/add/index.js

@@ -22,14 +22,12 @@ Page({
         ...options
       })
     };
-    console.log(options.resource, 'resource')
-    // this.formSet(options.resource)
-    if (options.resource == '医院管理' || options.resource == '科室管理' || options.resource == '医生管理' || options.resource == '经销商管理' || options.resource == '行事历') {
+    if (options.ownertable == 'sys_task') {
       this.setData({
         special: true
       })
+      this.formSet()
     }
-
     //编辑获取原信息,新建初始化模板
     if (options.sys_datafollowupid) {
       _Http.basic({
@@ -48,18 +46,42 @@ Page({
             wx.navigateBack()
           }, 300)
         };
-        // this.formSet(res.data.resource, res.data.type, '编辑', res.data)
-        // if (res.data.resource == '医院管理' || res.data.resource == '科室管理' || res.data.resource == '医生管理' || res.data.resource == '经销商管理' || res.data.resource == '行事历') {
-        //   this.setData({
-        //     special: true
-        //   })
-        // } else {
-          
-        // }
-        this.setData({
-          [`list[0].value`]: res.data.content,
-          resource: res.data.resource
-        })
+        if (options.ownertable == 'sys_task') {
+          let data = res.data;
+          data.sys_taskid = [data.tasktitle, [data.sys_taskid]]
+          if (res.data.followobj == '临床') {
+            data.sa_customersid = [data.hospitalname,[data.sa_customersid]]
+            data.sa_doctorid = [data.doctorname,[data.sa_doctorid]]
+            data.sa_hospitaldepid = [data.hospitaldepname,[data.sa_hospitaldepid]]
+            this.formSetNew(res.data.followobj)
+          }else {
+            data.sa_agentsid = [data.agentsname,[data.sa_agentsid]]
+            this.formSetNew(res.data.followobj)
+          }
+          let form = this.data.form.map(v => {
+            v.value = data[v.valueName];
+            if (v.label == '医生') {
+              v.disabled = false
+            }
+            return v
+          })
+          let list = this.data.list.map(k => {
+            k.value = data[k.key]
+            return k
+          })
+          console.log(form, 'form的数据')
+          this.setData({
+            form,
+            list,
+            resource: res.data.resource,
+            disabled: false
+          })
+        } else {
+          this.setData({
+            [`list[0].value`]: res.data.content,
+            resource: res.data.resource
+          })
+        }
         if (res.data.attinfos.length) this.selectComponent("#Yl_files").handleFiles(res.data.attinfos);
         this.data.content = Object.assign(res.data, options);
 
@@ -69,47 +91,8 @@ Page({
       this.data.content = options;
     }
   },
-  formSet(val, type_select, btn_type, datas) {
+  formSet() {
     let form = [{
-      label: "跟进类型",
-      error: false,
-      errMsg: "",
-      type: "option",
-      optionNmae: "hosfollowtype",
-      optionType: "radio", //复选   radio 单选
-      value: "",
-      placeholder: "跟进类型",
-      valueName: "type",
-      checking: "base",
-      required: true
-    }, {
-      label: "关联任务",
-      error: false,
-      errMsg: "",
-      type: "route",
-      url: "/prsx/select/task/index",
-      value: "",
-      placeholder: "任务",
-      valueName: "sys_taskid",
-      checking: "base",
-      required: false,
-      params: {
-        "content": {
-          "pageNumber": 1,
-          "pageSize": 20,
-          "where": {
-            "condition": ""
-          }
-        },
-        "id": 2025122309161202,
-      },
-      query: "&radio=true",
-    }, {
-      label: "推荐产品",
-      key: "products",
-      value: "",
-    }]
-    if (val == '医院管理' || val == '科室管理' || val == '医生管理') form.unshift({
       label: "跟进对象",
       error: false,
       errMsg: "",
@@ -127,36 +110,26 @@ Page({
       required: true, //必填
       direction: "horizontal",
       interrupt: true,
-      disabled: false
-    })
-
-    if(val == '经销商管理') form.unshift({
-      label: "跟进对象",
+    }, {
+      label: "跟进类型",
       error: false,
       errMsg: "",
-      hint: "",
-      type: "radio",
-      value: '',
-      radioList: [{
-        id: '临床',
-        name: '临床'
-      }, {
-        id: '经销商',
-        name: '经销商'
-      }],
-      valueName: "followobj", //绑定的字段名称
-      required: true, //必填
-      direction: "horizontal",
-      interrupt: true,
-      disabled: false
-    },{
-      label: "经销商",
+      type: "option",
+      optionNmae: "hosfollowtype",
+      optionType: "radio", //复选   radio 单选
+      value: "",
+      placeholder: "跟进类型",
+      valueName: "type",
+      checking: "base",
+      required: true
+    }, {
+      label: "关联任务",
       error: false,
       errMsg: "",
       type: "route",
-      url: "/prsx/select/dealer/index",
+      url: "/prsx/select/task/index",
       value: "",
-      placeholder: "经销商",
+      placeholder: "任务",
       valueName: "sys_taskid",
       checking: "base",
       required: false,
@@ -171,7 +144,11 @@ Page({
         "id": 2025122309161202,
       },
       query: "&radio=true",
-    })
+    }, {
+      label: "推荐产品",
+      valueName: "products",
+      value: "",
+    }]
 
     let list = [{
       label: "目的",
@@ -190,33 +167,139 @@ Page({
       key: "nextplan",
       value: "",
     }]
-    if (btn_type == '编辑') {
-      let data = datas;
-      form = form.map(v => {
-        v.value = data[v.valueName] || "";
-        return v
-      })
-      list = list.map(k => {
-        k.value = data[k.valueName] || "";
-        return k
-      })
-      form.find(v => v.label == '跟进对象').value = type_select
+    this.setData({
+      form,
+      list
+    })
+  },
+
+  formSetNew(followobj) {
+    console.log(followobj,'新的对象')
+    if (followobj == '临床') {
+      const existingJxsIndex = this.data.form.findIndex(item => item.label === "经销商");
+      if (existingJxsIndex !== -1) {
+        this.data.form.splice(existingJxsIndex, 1);
+      }
+      let lcForm = [{
+        label: "医院",
+        error: false,
+        errMsg: "",
+        type: "route",
+        url: "/prsx/select/hospital/index",
+        value: "",
+        placeholder: "医院",
+        valueName: "sa_customersid",
+        checking: "base",
+        required: true,
+        params: {
+          "content": {
+            "pageNumber": 1,
+            "pageSize": 20,
+            "where": {
+              "condition": ""
+            }
+          },
+          "id": 2025101409411402,
+        },
+        query: "&radio=true",
+      }, {
+        label: "医生",
+        error: false,
+        errMsg: "",
+        type: "route",
+        url: "/prsx/select/docter/index",
+        value: "",
+        placeholder: "医生",
+        valueName: "sa_doctorid",
+        checking: "base",
+        required: false,
+        params: {
+          "content": {
+            sa_customersid: 0,
+            "pageNumber": 1,
+            "pageSize": 20,
+            "where": {
+              "condition": ""
+            }
+          },
+          "id": 2025102310134602,
+        },
+        query: "&radio=true",
+        disabled: true
+      }, {
+        label: "科室",
+        error: false,
+        errMsg: "",
+        type: "route",
+        value: "",
+        placeholder: "科室",
+        valueName: "sa_hospitaldepid",
+        checking: "base",
+        required: false,
+        query: "&radio=true",
+        disabled: true
+      }]
+      const followObjectIndex = this.data.form.findIndex(item => item.label === "跟进对象");
+      if (followObjectIndex !== -1) {
+        this.data.form.splice(followObjectIndex + 1, 0, ...lcForm);
+      }
     } else {
-      if (val == '医院管理' || val == '科室管理' || val == '医生管理') {
-        form.find(v => v.label == '跟进对象').value = '临床'
-        form.find(v => v.label == '跟进对象').disabled = true
-      }else if(val == '经销商'){
-        form.find(v => v.label == '跟进对象').value = '经销商'
-        form.find(v => v.label == '跟进对象').disabled = true
+      const existingJxsIndex = this.data.form.findIndex(item => item.label === "医院");
+      if (existingJxsIndex !== -1) {
+        this.data.form.splice(existingJxsIndex, 1);
+      }
+      existingJxsIndex = this.data.form.findIndex(item => item.label === "医生");
+      if (existingJxsIndex !== -1) {
+        this.data.form.splice(existingJxsIndex, 1);
+      }
+      existingJxsIndex = this.data.form.findIndex(item => item.label === "科室");
+      if (existingJxsIndex !== -1) {
+        this.data.form.splice(existingJxsIndex, 1);
+      }
+      let jxsForm = [{
+        label: "经销商",
+        error: false,
+        errMsg: "",
+        type: "route",
+        url: "/prsx/select/firm/index",
+        value: "",
+        placeholder: "经销商",
+        valueName: "sa_agentsid",
+        checking: "base",
+        required: true,
+        params: {
+          "content": {
+            "pageNumber": 1,
+            "pageSize": 20,
+            "where": {
+              "condition": ""
+            }
+          },
+          "id": 2025123116453802,
+        },
+        query: "&radio=true",
+      }]
+      const followObjectIndex = this.data.form.findIndex(item => item.label === "跟进对象");
+      if (followObjectIndex !== -1) {
+        this.data.form.splice(followObjectIndex + 1, 0, ...jxsForm);
       }
     }
-
-
     this.setData({
-      form,
-      list
+      form: this.data.form
     })
   },
+  interrupt(e) {
+    console.log(e, 'e的数据初始')
+    const {
+      data,
+      form,
+      temporary
+    } = e.detail;
+    console.log(data, form, temporary)
+    if (temporary.item.label == '跟进对象') {
+      this.formSetNew()
+    }
+  },
   /* 表单必填项是否完成 */
   onConfirm({
     detail

prsx/trace/add/index.wxml

@@ -1,7 +1,8 @@
-<!-- <Yl_Headline title='跟进记录' type='switch' switchLabel='仅显示必填信息' switch='{{showAll}}' bind:callBack='onChange' />
-<Yl_field wx:if="{{special}}" id='Form' form='{{form}}' showAll='{{!showAll}}' bind:onConfirm='onConfirm' />
+<Yl_Headline wx:if="{{special}}" title='跟进记录' type='switch' switchLabel='仅显示必填信息' switch='{{showAll}}' bind:callBack='onChange' />
+<Yl_field wx:if="{{special}}" id='Form' form='{{form}}' showAll='{{!showAll}}' bind:onConfirm='onConfirm' 
+bind:interrupt='interrupt' />
 
-<view style="height: 20rpx;" /> -->
+<view style="height: 20rpx;" />
 <view>
   <view class="inputs" wx:for="{{list}}" wx:key="key" >
     <view class="label">
@@ -32,6 +33,6 @@
 </view>
 <view style="height: 130rpx;" />
 <view class="footer">
-    <van-button wx:if="{{special}}" custom-class='but' disabled='{{disabled || loading}}' loading='{{loading}}' bindclick="submit">{{language['确定']||'确定'}}</van-button>
-    <van-button wx:else="" custom-class='but' disabled='{{list[0].value.length==0 || loading}}' loading='{{loading}}' bindclick="submit">{{language['确定']||'确定'}}</van-button>
+    <van-button wx:if="{{special}}" custom-class='but' disabled='{{disabled}}' loading='{{loading}}' bindclick="submit">{{language['确定']||'确定'}}</van-button>
+    <van-button wx:else custom-class='but' disabled='{{list[0].value.length==0 || loading}}' loading='{{loading}}' bindclick="submit">{{language['确定']||'确定'}}</van-button>
 </view>

prsx/trace/detail/index.js

@@ -1,73 +1,138 @@
 const _Http = getApp().globalData.http;
 
 Page({
-    data: {
-        ownertable: null,
-        ownerid: null,
-        sys_datafollowupid: null,
-        detail: {},
-        tabbarList: [{
-            icon: "color-bianji",
-            label: "编辑"
-        }, {
-            icon: "icon-shanchu",
-            label: "删除"
-        }],
-    },
-    onLoad(options) {
-        if (options.data) {
-            this.setData({
-                ...JSON.parse(options.data),
-                userid: wx.getStorageSync('userMsg').userid
-            })
-            this.getDetail();
-            getApp().globalData.Language.getLanguagePackage(this, '跟进动态详情');
-        }
-    },
-    getDetail() {
-        _Http.basic({
-            "id": 20221026085601,
-            "content": {
-                "sys_datafollowupid": this.data.sys_datafollowupid
-            }
-        }).then(res => {
-            console.log("跟进详情", res)
-            if (res.code != '1') return wx.showToast({
-                title: res.data,
-                icon: "none"
-            })
-            this.selectComponent("#Yl_files").initData()
-            this.selectComponent("#Yl_files").handleFiles(res.data.attinfos)
-            this.setData({
-                detail: res.data,
-                briefs: [{
-                    label: "跟进类型",
-                    value: res.data.type
-                }, {
-                    label: "跟进内容",
-                    value: res.data.content
-                }]
-            })
+  data: {
+    ownertable: null,
+    ownerid: null,
+    sys_datafollowupid: null,
+    detail: {},
+    tabbarList: [{
+      icon: "color-bianji",
+      label: "编辑"
+    }, {
+      icon: "icon-shanchu",
+      label: "删除"
+    }],
+  },
+  onLoad(options) {
+    if (options.data) {
+      this.setData({
+        ...JSON.parse(options.data),
+        userid: wx.getStorageSync('userMsg').userid
+      })
+      this.getDetail();
+      getApp().globalData.Language.getLanguagePackage(this, '跟进动态详情');
+    }
+  },
+  getDetail() {
+    _Http.basic({
+      "id": 20221026085601,
+      "content": {
+        "sys_datafollowupid": this.data.sys_datafollowupid
+      }
+    }).then(res => {
+      console.log("跟进详情", res)
+      if (res.code != '1') return wx.showToast({
+        title: res.data,
+        icon: "none"
+      })
+      let briefs
+      if (res.data.resource == '经销商管理') {
+        briefs = [{
+          label: "跟进对象",
+          value: res.data.followobj
+        },{
+          label: "经销商",
+          value: res.data.agentsname
+        },{
+          label: "跟进类型",
+          value: res.data.type
+        },{
+          label: "关联任务",
+          value: res.data.tasktitle
+        },{
+          label: "推荐产品",
+          value: res.data.products
+        },{
+          label: "目的",
+          value: res.data.target
+        },{
+          label: "过程",
+          value: res.data.content
+        },{
+          label: "结果",
+          value: res.data.results
+        },{
+          label: "下次跟进计划",
+          value: res.data.nextplan
+        }]
+      }else if(res.data.resource == '医院管理' || res.data.resource == '医生管理' || res.data.resource == '科室管理'){
+        briefs = [{
+          label: "跟进对象",
+          value: res.data.followobj
+        },{
+          label: "医院",
+          value: res.data.hospitalname
+        },{
+          label: "科室",
+          value: res.data.hospitaldepname
+        },{
+          label: "医生",
+          value: res.data.doctorname
+        },{
+          label: "跟进类型",
+          value: res.data.type
+        },{
+          label: "关联任务",
+          value: res.data.tasktitle
+        },{
+          label: "推荐产品",
+          value: res.data.products
+        },{
+          label: "目的",
+          value: res.data.target
+        },{
+          label: "过程",
+          value: res.data.content
+        },{
+          label: "结果",
+          value: res.data.results
+        },{
+          label: "下次跟进计划",
+          value: res.data.nextplan
+        }]
+      }else{
+        briefs = [{
+          label: "跟进内容",
+          value: res.data.content
+        }]
+      }
+      this.selectComponent("#Yl_files").initData()
+      this.selectComponent("#Yl_files").handleFiles(res.data.attinfos)
+      this.setData({
+        detail: res.data,
+        briefs
+      })
+    })
+  },
+  /* tab 切换回调 */
+  tabbarOnClick({
+    detail
+  }) {
+    const item = this.data.detail;
+    switch (detail.label) {
+      case "编辑":
+        wx.navigateTo({
+          url: `/prsx/trace/add/index?ownertable=${this.data.ownertable}&ownerid=${this.data.ownerid}&sys_datafollowupid=${item.sys_datafollowupid}`
+        });
+        break;
+      case "删除":
+        _Http.traceHandleDelete(item).then(res => {
+          if (res) setTimeout(() => {
+            wx.navigateBack()
+          }, 300)
         })
-    },
-    /* tab 切换回调 */
-    tabbarOnClick({
-        detail
-    }) {
-        const item = this.data.detail;
-        switch (detail.label) {
-            case "编辑":
-                wx.navigateTo({
-                    url: `/prsx/trace/add/index?ownertable=${this.data.ownertable}&ownerid=${this.data.ownerid}&sys_datafollowupid=${item.sys_datafollowupid}`
-                });
-                break;
-            case "删除":
-                _Http.traceHandleDelete(item).then(res => {
-                    if (res) setTimeout(() => {
-                        wx.navigateBack()
-                    }, 300)
-                })
-                break;
-        }
+        break;
     }
+  }
 })

prsx/trace/list/index.js

@@ -19,6 +19,9 @@ Component({
         },
         disabled: {
             type: Boolean
+        },
+        resource: {
+          type:String
         }
     },
     lifetimes: {

prsx/trace/list/index.wxml

@@ -19,26 +19,59 @@
                 </view>
             </view>
         </view>
-        <view class="text">
+        <view class="text" wx:if="{{ownertable != 'sa_customers' && ownertable != 'sa_doctor' && ownertable != 'sa_hospitaldep' && ownertable != 'sa_agents' && ownertable != 'sys_task'}}">
             <text class="text-label">{{language['跟进内容']||'跟进内容'}}：</text>{{language[item.content]||item.content}}
         </view>
-        <view class="type" wx:if="{{item.type}}">
+        <view class="type" wx:if="{{ownertable == 'sa_customers' || ownertable == 'sa_doctor' || ownertable == 'sa_hospitaldep' || ownertable == 'sa_agents' || ownertable == 'sys_task'}}">
+            <text class="text-label">{{language['跟进对象']||'跟进对象'}}：</text><text>{{language[item.followobj]||item.followobj}}</text>
+        </view>
+        <view class="type" wx:if="{{item.hospitalname}}">
+            <text class="text-label">{{language['医院']||'医院'}}：</text><text>{{language[item.hospitalname]||item.hospitalname}}</text>
+        </view>
+        <view class="type" wx:if="{{item.hospitaldepname}}">
+            <text class="text-label">{{language['科室']||'科室'}}：</text><text>{{language[item.hospitaldepname]||item.hospitaldepname}}</text>
+        </view>
+        <view class="type" wx:if="{{item.doctorname}}">
+            <text class="text-label">{{language['医生']||'医生'}}：</text><text>{{language[item.doctorname]||item.doctorname}}</text>
+        </view>
+        <view class="type" wx:if="{{item.agentsname}}">
+            <text class="text-label">{{language['经销商']||'经销商'}}：</text><text>{{language[item.agentsname]||item.agentsname}}</text>
+        </view>
+        <view class="type" wx:if="{{ownertable == 'sa_customers' || ownertable == 'sa_doctor' || ownertable == 'sa_hospitaldep' || ownertable == 'sa_agents' || ownertable == 'sys_task'}}">
             <text class="text-label">{{language['跟进类型']||'跟进类型'}}：</text><text>{{language[item.type]||item.type}}</text>
         </view>
+        <view class="type" wx:if="{{item.products}}">
+            <text class="text-label">{{language['关联任务']||'关联任务'}}：</text><text>{{language[item.tasktitle]||item.tasktitle}}</text>
+        </view>
+        <view class="type" wx:if="{{item.products}}">
+            <text class="text-label">{{language['推荐产品']||'推荐产品'}}：</text><text>{{language[item.products]||item.products}}</text>
+        </view>
+        <view class="type" wx:if="{{ownertable == 'sa_customers' || ownertable == 'sa_doctor' || ownertable == 'sa_hospitaldep' || ownertable == 'sa_agents' || ownertable == 'sys_task'}}">
+            <text class="text-label">{{language['目的']||'目的'}}：</text><text>{{language[item.target]||item.target||'--'}}</text>
+        </view>
+        <view class="type" wx:if="{{ownertable == 'sa_customers' || ownertable == 'sa_doctor' || ownertable == 'sa_hospitaldep' || ownertable == 'sa_agents' || ownertable == 'sys_task'}}">
+            <text class="text-label">{{language['过程']||'过程'}}：</text><text>{{language[item.content]||item.content||'--'}}</text>
+        </view>
+        <view class="type" wx:if="{{ownertable == 'sa_customers' || ownertable == 'sa_doctor' || ownertable == 'sa_hospitaldep' || ownertable == 'sa_agents' || ownertable == 'sys_task'}}">
+            <text class="text-label">{{language['结果']||'结果'}}：</text><text>{{language[item.results]||item.results||'--'}}</text>
+        </view>
+        <view class="type" wx:if="{{ownertable == 'sa_customers' || ownertable == 'sa_doctor' || ownertable == 'sa_hospitaldep' || ownertable == 'sa_agents' || ownertable == 'sys_task'}}">
+            <text class="text-label">{{language['下次跟进计划']||'下次跟进计划'}}：</text><text>{{language[item.nextplan]||item.nextplan||'--'}}</text>
+        </view>
     </navigator>
     <Yl_Files wx:if="{{item.attinfos.length}}" attinfos='{{item.attinfos}}' />
     <commentList id="Comment{{item.sys_datafollowupid}}" comments='{{item.comment}}' quantity="{{item.commentqty}}" ownerid='{{item.sys_datafollowupid}}' bind:updateCommentList='updateCommentList' />
     <view class="bottom">
-        <navigator url="#" class="comment" bind:tap="comment" id="Comment{{item.sys_datafollowupid}}">
+        <!-- <navigator url="#" class="comment" bind:tap="comment" id="Comment{{item.sys_datafollowupid}}">
             <text class="iconfont icon-huifu" /><text style="color: #3874F6;">{{language['评论']||'评论'}}({{item.commentqty}})</text>
-        </navigator>
+        </navigator> -->
         <view style="flex: 1;" />
-        <block wx:if="{{disabled  && userid == item.createuserid}}">
-            <navigator url="#" bindtap="editItem" data-item="{{item}}">
+        <block wx:if="{{(disabled  && userid == item.createuserid) || ownertable == 'sa_customers' || ownertable == 'sa_doctor' || ownertable == 'sa_hospitaldep' || ownertable == 'sa_agents' || ownertable == 'sys_task'}}">
+            <navigator url="#" bindtap="editItem" data-item="{{item}}" wx:if="{{ownertable != 'sa_customers' && ownertable != 'sa_doctor' && ownertable != 'sa_hospitaldep' && ownertable != 'sa_agents'}}">
                 <text class="iconfont icon-bianji" />{{language['编辑']||'编辑'}}
             </navigator>
-            <navigator url="#" bindtap="deleteItem" data-item="{{item}}">
-                <text class="iconfont icon-qunzu" />{{language['删除']||'删除'}}
+            <navigator url="#" bindtap="deleteItem" data-item="{{item}}" wx:if="{{userid == item.createuserid}}">
+                <text class="iconfont icon-shanchu2" />{{language['删除']||'删除'}}
             </navigator>
         </block>
     </view>

prsx/tryOut/detail.wxml

@@ -32,7 +32,7 @@
 <!-- 功能 -->
 <Yl_FunTabs list='{{tabsList}}' active='{{tabsActive}}' bind:onChenge="tabsChange">
   <Preview slot='详细信息' list1='{{list1}}' list2='{{list2}}' />
-  <tryDetail slot='试用明细' id='tryDetail' disabled="{{isLeader}}" />
+  <tryDetail slot='试用明细' id='tryDetail' disabled="{{isLeader && detail.status == '新建'}}" />
   <Trace resource='安装管理' slot='跟进动态' id='Trace' ownertable='sa_trial' ownerid='{{sys_enterpriseid}}' disabled="{{detail.status != '已终止'}}" ownerid1='{{detail.sa_trialid}}' />
   <Record slot="操作" id="Record" ownertable='sa_trial' ownerid='{{sa_trialid}}' />
   <Files slot="附件" id="Files" ownertable='sa_trial' ownerid='{{sa_trialid}}' disabled="{{detail.status != '已终止'}}" />

prsx/tryOut/insert.js

@@ -1,305 +1,321 @@
 let _Http = getApp().globalData.http,
-    getTime = require("../../utils/getTime");
+  getTime = require("../../utils/getTime");
 
 Page({
-    data: {
-        loading: false,
-        showAll: false,
-        content: {
-            sa_trialid: 0,
-            sa_hospitaldepid:0
-        },
-        disabled: true,
+  data: {
+    loading: false,
+    showAll: false,
+    content: {
+      sa_trialid: 0,
+      sa_hospitaldepid: 0
     },
-    onLoad(options) {
-        let form = [{
-          label: "申请日期",
-          error: false,
-          errMsg: "",
-          type: "date",
-          start: '',
-          value: new Date().toISOString().split('T')[0],
-          placeholder: "申请日期",
-          valueName: "applydate",
-          checking: "base",
-          required: true,
-          interrupt:true
-      },{
-        label: "试用类型",
-        error: false,
-        errMsg: "",
-        type: "option",
-        optionNmae: "testtype",
-        optionType: "radio", //复选   radio 单选
-        value: "",
-        placeholder: "试用类型",
-        valueName: "type",
-        checking: "base",
-        required: true
-    },{
-            label: "医院",
-            error: false,
-            errMsg: "",
-            type: "route",
-            url: "/prsx/select/hospital/index",
-            value: "",
-            placeholder: "医院",
-            valueName: "sa_customersid",
-            checking: "base",
-            required: true,
-            params: {
-                "content": {
-                    "isExport": 0,
-                    "pageNumber": 1,
-                    "pageSize": 20,
-                    "where": {
-                        "condition": ""
-                    }
-                },
-                "id": 2025102814083902,
-            },
-            query: "&radio=true",
-            required: true,
-            interrupt: true,
-        },{
-          label: "医生",
-          error: false,
-          errMsg: "",
-          type: "route",
-          url: "/prsx/select/docter/index",
-          value: "",
-          placeholder: "医生",
-          valueName: "sa_doctorid",
-          checking: "base",
-          required: true,
-          params: {
-              "content": {
-                  "isExport": 0,
-                  "sa_customersid":0,
-                  "pageNumber": 1,
-                  "pageSize": 20,
-                  "where": {
-                      "condition": ""
-                  }
-              },
-              "id": 2025102310134602,
-          },
-          query: "&radio=true",
-          required: true,
-          interrupt: true,
-          disabled: true,
+    disabled: true,
+  },
+  onLoad(options) {
+    let form = [{
+      label: "申请日期",
+      error: false,
+      errMsg: "",
+      type: "date",
+      start: '',
+      value: new Date().toISOString().split('T')[0],
+      placeholder: "申请日期",
+      valueName: "applydate",
+      checking: "base",
+      required: true,
+      interrupt: true
+    }, {
+      label: "试用类型",
+      error: false,
+      errMsg: "",
+      type: "option",
+      optionNmae: "testtype",
+      optionType: "radio", //复选   radio 单选
+      value: "",
+      placeholder: "试用类型",
+      valueName: "type",
+      checking: "base",
+      required: true
+    }, {
+      label: "医院",
+      error: false,
+      errMsg: "",
+      type: "route",
+      url: "/prsx/select/hospital/index",
+      value: "",
+      placeholder: "医院",
+      valueName: "sa_customersid",
+      checking: "base",
+      required: true,
+      params: {
+        "content": {
+          "isExport": 0,
+          "pageNumber": 1,
+          "pageSize": 20,
+          "where": {
+            "condition": ""
+          }
+        },
+        "id": 2025102814083902,
+      },
+      query: "&radio=true",
+      required: true,
+      interrupt: true,
+    }, {
+      label: "医生",
+      error: false,
+      errMsg: "",
+      type: "route",
+      url: "/prsx/select/docter/index",
+      value: "",
+      placeholder: "医生",
+      valueName: "sa_doctorid",
+      checking: "base",
+      required: true,
+      params: {
+        "content": {
+          "isExport": 0,
+          "sa_customersid": 0,
+          "pageNumber": 1,
+          "pageSize": 20,
+          "where": {
+            "condition": ""
+          }
+        },
+        "id": 2025102310134602,
+      },
+      query: "&radio=true",
+      required: true,
+      interrupt: true,
+      disabled: true,
 
-      }, {
-        label: "科室",
-        error: false,
-        errMsg: "",
-        type: "route",
-        value: "",
-        placeholder: "科室",
-        valueName: "sa_hospitaldepid",
-        checking: "base",
-        required: false,
-        disabled: true,
     }, {
-            label: "经销商",
-            error: false,
-            errMsg: "",
-            type: "route",
-            url: "/prsx/select/firm/index",
-            value: "",
-            params: {
-                id: 2025111915343902,
-                "content": {
-                    "pageSize": 20,
-                    "pageNumber": 1,
-                    sa_hospitaldepid: 0
-                },
-            },
-            query: "&radio=true",
-            placeholder: "选择经销商",
-            valueName: "sa_agentsid",
-            checking: "base",
-            required: false,
-            interrupt: true,
-        }, {
-            label: "发货日期",
-            error: false,
-            errMsg: "",
-            type: "date",
-            start: '',
-            value: '',
-            placeholder: "发货日期",
-            valueName: "deliverydate",
-            checking: "base",
-            required: true,
-            interrupt:true
-        }, {
-          label: "领用人",
-          error: false,
-          errMsg: "",
-          type: "textarea",
-          value: "",
-          placeholder: "领用人",
-          valueName: "user",
-          checking: "base",
-          required: true
-      }, {
-        label: "试用结束日期",
-        error: false,
-        errMsg: "",
-        type: "date",
-        start: '',
-        value: '',
-        placeholder: "试用结束日期",
-        valueName: "enddate",
-        checking: "base",
-        required: true,
-        interrupt:true
+      label: "科室",
+      error: false,
+      errMsg: "",
+      type: "route",
+      value: "",
+      placeholder: "科室",
+      valueName: "sa_hospitaldepid",
+      checking: "base",
+      required: false,
+      disabled: true,
+    }, {
+      label: "经销商",
+      error: false,
+      errMsg: "",
+      type: "route",
+      url: "/prsx/select/firm/index",
+      value: "",
+      placeholder: "选择经销商",
+      valueName: "sa_agentsid",
+      checking: "base",
+      required: true,
+      params: {
+        id: 2025111915343902,
+        "content": {
+          "pageSize": 20,
+          "pageNumber": 1,
+          sa_hospitaldepid: 0
+        },
+      },
+      query: "&radio=true",
+      valueName: "sa_agentsid",
+      checking: "base",
+      required: false,
+      interrupt: true,
+      disabled: true,
+    }, {
+      label: "发货日期",
+      error: false,
+      errMsg: "",
+      type: "date",
+      start: '',
+      value: '',
+      placeholder: "发货日期",
+      valueName: "deliverydate",
+      checking: "base",
+      required: true,
+      interrupt: true
+    }, {
+      label: "领用人",
+      error: false,
+      errMsg: "",
+      type: "textarea",
+      value: "",
+      placeholder: "领用人",
+      valueName: "user",
+      checking: "base",
+      required: true
     }, {
-            label: "备注",
-            error: false,
-            errMsg: "",
-            type: "textarea",
-            value: "",
-            placeholder: "备注",
-            valueName: "remarks",
-            checking: "base",
-            required: false
-        }]
-        if (options.data) {
-            let data = JSON.parse(options.data);
-            data.sa_customersid = [data.hospitalname, [data.sa_customersid]]
-            data.sa_agentsid = [data.agentname, [data.sa_agentsid]]
-            data.sa_doctorid = [data.doctorname,[data.sa_doctorid]]
-            data.sa_hospitaldepid = [data.hospitaldepname,[data.sa_hospitaldepid]]
-            form = form.map(v => {
-                v.value = data[v.valueName];
-                if (v.label == '经销商') v.disabled = false
-                return v
-            })
-            this.setData({
-                disabled: false,
-                content: {
-                    sa_trialid: data.sa_trialid,
-                },
-                form
-            })
+      label: "试用结束日期",
+      error: false,
+      errMsg: "",
+      type: "date",
+      start: '',
+      value: '',
+      placeholder: "试用结束日期",
+      valueName: "enddate",
+      checking: "base",
+      required: true,
+      interrupt: true
+    }, {
+      label: "备注",
+      error: false,
+      errMsg: "",
+      type: "textarea",
+      value: "",
+      placeholder: "备注",
+      valueName: "remarks",
+      checking: "base",
+      required: false
+    }]
+    if (options.data) {
+      let data = JSON.parse(options.data);
+      console.log(data,'1111')
+      data.sa_customersid = [data.hospitalname, [data.sa_customersid]]
+      data.sa_agentsid = data.agentname?[data.agentname, [data.sa_agentsid]]:0
+      data.sa_doctorid = [data.doctorname, [data.sa_doctorid]]
+      data.sa_hospitaldepid = [data.hospitaldepname, [data.sa_hospitaldepid]]
+      form = form.map(v => {
+        v.value = data[v.valueName];
+        if (v.label == '经销商') {
+          v.disabled = false
+          v.params.content.sa_hospitaldepid = data.sa_hospitaldepid[1][0]
+        }
+        if (v.label == '医生') {
+          v.disabled = false
+          v.params.content.sa_customersid = data.sa_customersid[1][0]
         }
-        this.setData({
-            form
-        })
-        getApp().globalData.Language.getLanguagePackage(this, options.data ? '编辑试用申请' : '新建试用申请');
+        return v
+      })
+      this.setData({
+        disabled: false,
+        content: {
+          sa_trialid: data.sa_trialid,
+        },
+        form
+      })
+    }
+    this.setData({
+      form
+    })
+    getApp().globalData.Language.getLanguagePackage(this, options.data ? '编辑试用申请' : '新建试用申请');
 
-    },
-    interrupt(e) {
-      console.log(e,'输出222')
-        const {
-            data,
-            form,
-            temporary
-        } = e.detail;
-        console.log(data, form, temporary)
-        if (temporary.item.label == '医院') {
-            form.find(v => v.label == '医院').value = data.value;
-            let obj2 = form.find(v => v.label == '医生')
-            obj2.params.content.sa_customersid = data.id[0];
-            obj2.value = '';
-            obj2.disabled = false;
-            wx.navigateBack()
-        }else if(temporary.item.label == '医生'){
-          form.find(v => v.label == '医生').value = data.value;
-          let obj2 = form.find(v => v.label == '经销商')
-          obj2.params.content.sa_hospitaldepid = data.item.sa_hospitaldepid;
-          obj2.value = '';
-          obj2.disabled = false;
-          form.find(v => v.label == '科室').value = [data.item.hospitaldepname, [data.item.sa_hospitaldepid]];
-          wx.navigateBack()
-        }else if(temporary.item.label == '经销商'){
-          form.find(v => v.label == '经销商').value = data.value;
+  },
+  interrupt(e) {
+    console.log(e)
+    const {
+      data,
+      form,
+      temporary
+    } = e.detail;
+    console.log(data, form, temporary)
+    if (temporary.item.label == '医院') {
+      form.find(v => v.label == '医院').value = data.value;
+      let obj2 = form.find(v => v.label == '医生')
+      obj2.params.content.sa_customersid = data.id[0];
+      obj2.value = '';
+      obj2.disabled = false;
+      let obj3 = form.find(v => v.label == '科室')
+      obj3.value = '';
+      let obj4 = form.find(v => v.label == '经销商')
+      obj4.value = '';
+      wx.navigateBack()
+    } else if (temporary.item.label == '医生') {
+      form.find(v => v.label == '医生').value = data.value;
+      let obj2 = form.find(v => v.label == '经销商')
+      obj2.params.content.sa_hospitaldepid = data.item.sa_hospitaldepid;
+      obj2.value = '';
+      obj2.disabled = false;
+      form.find(v => v.label == '科室').value = [data.item.hospitaldepname, [data.item.sa_hospitaldepid]];
+      wx.navigateBack()
+    } else if (temporary.item.label == '经销商') {
+      form.find(v => v.label == '经销商').value = data.value;
+      wx.navigateBack()
+    } else if (temporary.item.label == '申请日期') {
+      let obj2 = form.find(v => v.label == '发货日期')
+      if (new Date(data.value).getTime() > new Date(obj2.value)) {
+        obj2.errMsg = '发货日期不可小于申请日期'
+      } else {
+        obj2.errMsg = ''
+      }
+    } else if (temporary.item.label == '发货日期') {
+      let obj2 = form.find(v => v.label == '发货日期')
+      let obj3 = form.find(v => v.label == '申请日期')
+      if (new Date(obj3.value).getTime() > new Date(obj2.value)) {
+        obj2.errMsg = '发货日期不可小于申请日期'
+      } else {
+        obj2.errMsg = ''
+      }
+    } else if (temporary.item.label == '试用结束日期') {
+      let obj2 = form.find(v => v.label == '试用结束日期')
+      let obj3 = form.find(v => v.label == '发货日期')
+      if (new Date(obj3.value).getTime() > new Date(obj2.value)) {
+        obj2.errMsg = '试用结束日期不可小于发货日期'
+      } else {
+        obj2.errMsg = ''
+      }
+    }
+    this.selectComponent("#Form").confirm();
+    this.setData({
+      form
+    })
+  },
+  /* 表单必填项是否完成 */
+  onConfirm({
+    detail
+  }) {
+    this.setData({
+      disabled: detail
+    })
+  },
+  // 是否显示全部
+  onChange({
+    detail
+  }) {
+    this.setData({
+      showAll: detail
+    })
+  },
+  async submit() {
+    this.setData({
+      loading: true
+    })
+    let data = this.selectComponent("#Form").submit(),
+      content = this.data.content;
+    data.sa_customersid = data.sa_customersid.length ? data.sa_customersid[1][0] : 0
+    data.sa_agentsid = data.sa_agentsid.length ? data.sa_agentsid[1][0] : 0
+    data.sa_doctorid = data.sa_doctorid.length ? data.sa_doctorid[1][0] : 0
+    data.sa_hospitaldepid = data.sa_hospitaldepid.length ? data.sa_hospitaldepid[1][0] : 0
+    _Http.basic({
+      "id": 2025110710322702,
+      "content": {
+        ...content,
+        ...data,
+      }
+    }).then(res => {
+      this.setData({
+        loading: false
+      })
+      wx.showToast({
+        title: res.code != '1' ? res.msg : '保存成功',
+        icon: "none",
+        mask: res.code == '1'
+      })
+      if (res.code != '1') return;
+      getCurrentPages().forEach(v => {
+        if (v.route == 'prsx/tryOut/detail') v.getDetail()
+      })
+      setTimeout(() => {
+        if (content.sa_trialid == 0) {
+          wx.redirectTo({
+            url: '/prsx/tryOut/detail?id=' + res.data.sa_trialid,
+          })
+        } else {
           wx.navigateBack()
-        }else if(temporary.item.label == '申请日期'){
-          let obj2 = form.find(v => v.label == '发货日期')
-          if(new Date(data.value).getTime() > new Date(obj2.value)){
-            obj2.errMsg = '发货日期不可小于申请日期'
-          }else {
-            obj2.errMsg = ''
-          }
-        }else if(temporary.item.label == '发货日期'){
-          let obj2 = form.find(v => v.label == '发货日期')
-          let obj3 = form.find(v => v.label == '申请日期')
-          if(new Date(obj3.value).getTime() > new Date(obj2.value)){
-            obj2.errMsg = '发货日期不可小于申请日期'
-          }else {
-            obj2.errMsg = ''
-          }
-        }else if(temporary.item.label == '试用结束日期'){
-          let obj2 = form.find(v => v.label == '试用结束日期')
-          let obj3 = form.find(v => v.label == '发货日期')
-          if(new Date(obj3.value).getTime() > new Date(obj2.value)){
-            obj2.errMsg = '试用结束日期不可小于发货日期'
-          }else {
-            obj2.errMsg = ''
-          }
         }
-        this.selectComponent("#Form").confirm();
-        this.setData({
-            form
-        })
-    },
-    /* 表单必填项是否完成 */
-    onConfirm({
-        detail
-    }) {
-        this.setData({
-            disabled: detail
-        })
-    },
-    // 是否显示全部
-    onChange({
-        detail
-    }) {
-        this.setData({
-            showAll: detail
-        })
-    },
-    async submit() {
-        this.setData({
-            loading: true
-        })
-        let data = this.selectComponent("#Form").submit(),
-            content = this.data.content;
-        data.sa_customersid = data.sa_customersid.length ? data.sa_customersid[1][0] : 0
-        data.sa_agentsid = data.sa_agentsid.length ? data.sa_agentsid[1][0] : 0
-        data.sa_doctorid = data.sa_doctorid.length ? data.sa_doctorid[1][0] : 0
-        data.sa_hospitaldepid = data.sa_hospitaldepid.length ? data.sa_hospitaldepid[1][0] : 0
-        _Http.basic({
-            "id": 2025110710322702,
-            "content": {
-                ...content,
-                ...data,
-            }
-        }).then(res => {
-            this.setData({
-                loading: false
-            })
-            wx.showToast({
-                title: res.code != '1' ? res.msg : '保存成功',
-                icon: "none",
-                mask: res.code == '1'
-            })
-            if (res.code != '1') return;
-            getCurrentPages().forEach(v => {
-                if (v.route == 'prsx/tryOut/detail') v.getDetail()
-            })
-            setTimeout(() => {
-                if (content.sa_trialid == 0) {
-                    wx.redirectTo({
-                        url: '/prsx/tryOut/detail?id=' + res.data.sa_trialid,
-                    })
-                } else {
-                    wx.navigateBack()
-                }
-            }, 300)
-        })
-    },
+      }, 300)
+    })
+  },
 })

prsx/tryOut/tryDetail/index.wxml

@@ -43,7 +43,7 @@
         </view>
         <view class="bottom">
           <text style="color: #666;">试用数量：</text>
-          <input placeholder="填写试用数量" type="digit" value="{{item.qty ||''}}" bindblur="changeQty" data-index="{{index}}" />
+          <input disabled="{{!disabled}}" placeholder="填写试用数量" type="digit" value="{{item.qty ||''}}" bindblur="changeQty" data-index="{{index}}" />
         </view>
       </view>
       <navigator wx:if="{{disabled}}" url="#" class="iconfont-box" data-item="{{item}}" bind:tap="deleteItem">

utils/work/apps.js

@@ -53,7 +53,7 @@ function getapps() {
 function getcrm() {
   const paths = [{
     name: "行事历",
-    path: "/prsx/calendarN/index",
+    path: "/prsx/calendar/index",
     icon: "work-shichanghuodong",
     objectname: ""
   }, {