Browse Source

工单修改

xiaohaizhao 2 years ago
parent
commit
d8025acf7d

+ 132 - 126
Eservice/nodeDetail/index.js

@@ -1,111 +1,109 @@
-// pages/nodeDetail/index.js
-import api from '../api/api'
+import api from '../api/api';
+const _Http = getApp().globalData.http
 Page({
-
-  /**
-   * 页面的初始数据
-   */
   data: {
-    stopClick:'',
-    SignName:true,
-    timerid:null,
-    act_confirm_value:'是',
-    form:{
-      "sa_workorderid":0,
-      "sa_workorder_nodeid":0,
-      "remarks":"",
-      "textcontent":"",
-      "confirm_value":"",
-      "amount":0,
-      "isconfirm":0,
-      "team":[],
-      "trainers":[
-      ],
-      "traintitem":[],
+    stopClick: '',
+    SignName: true,
+    timerid: null,
+    act_confirm_value: '是',
+    form: {
+      "sa_workorderid": 0,
+      "sa_workorder_nodeid": 0,
+      "remarks": "",
+      "textcontent": "",
+      "confirm_value": "",
+      "amount": 0,
+      "isconfirm": 0,
+      "team": [],
+      "trainers": [],
+      "traintitem": [],
     },
-    bindNormalData:{
+    bindNormalData: {
       ownertable: 'sa_workorder_node',
       ownerid: 0,
       usetype: 'default'
     },
-    bindContractData:{
+    bindContractData: {
       "ownertable": "sa_workorder_node",
       "ownerid": 0,
       "usetype": "contract",
     },
-    bindSignNameData:{
+    bindSignNameData: {
       "ownertable": "sa_workorder_node",
       "ownerid": 0,
       "usetype": "signature",
     }
   },
-  async nodeDetail () {
+  async nodeDetail() {
     const res = await api._post({
       "id": "20230209091103",
-      "version":1,
+      "version": 1,
       "content": {
-        "sa_workorderid":this.data.sa_workorderid,
-        "sa_workorder_nodeid":this.data.sa_workorder_nodeid
+        "sa_workorderid": this.data.sa_workorderid,
+        "sa_workorder_nodeid": this.data.sa_workorder_nodeid
       }
     })
     this.setData({
-      mainData:res.data[0],
-      titems:res.data[0].titems
+      mainData: res.data[0],
+      titems: res.data[0].titems
     })
     this.setDefaultData()
   },
-
   // 是否确认
-  confirmValue (data) {
+  confirmValue(data) {
     this.data.form.confirm_value = data.currentTarget.dataset.item
     this.setData({
-      form:this.data.form
+      form: this.data.form
     })
     this.updateNode()
   },
-
   // 文本信息
-  textContent (data) {
+  textContent(data) {
     this.data.form.textcontent = data.detail.value
     this.setData({
-      form:this.data.form
+      form: this.data.form
     })
     this.updateNode()
   },
-
   // 是否有偿
-  amountPay (data) {
+  amountPay(data) {
     this.data.form.amount = data.detail.value
     this.setData({
-      form:this.data.form
+      form: this.data.form
     })
     this.updateNode()
   },
-
   // 备 注
-  remarkEdit (data) {
+  remarkEdit(data) {
     this.data.form.remarks = data.detail.value
     this.setData({
-      form:this.data.form
+      form: this.data.form
     })
     this.updateNode()
   },
-  confirmBill () {
+  confirmBill() {
     this.data.form.isconfirm = 1
     this.setData({
-      form:this.data.form
+      form: this.data.form
     })
     this.updateNode()
   },
   // 更新节点
-  async updateNode (e) {
-    this.data.form.traintitem  = this.data.titems
+  async updateNode(e) {
+    this.data.form.traintitem = this.data.titems
     this.data.form.sa_workorderid = this.data.sa_workorderid
     this.data.form.sa_workorder_nodeid = this.data.sa_workorder_nodeid
+    this.data.form.team = []
     const res = await api._post({
       "id": "20230209094203",
-      "content":this.data.form
-    })
+      "content": this.data.form
+    });
+    if (!this.data.form.team.some(v => v.userid == wx.getStorageSync('userMsg').userid)) {
+      this.setData({
+        teams: [wx.getStorageSync('userMsg').userid]
+      })
+      this.addUser(false);
+    }
     if (e && e.currentTarget.dataset.info === 'needBack') {
       wx.navigateBack()
     } else {
@@ -113,22 +111,21 @@ Page({
     }
   },
   // 获取输入的数据
-  setDefaultData () {
+  setDefaultData() {
     let that = this
-    Object.keys(this.data.mainData).map((key,index)=>{
-      Object.keys(this.data.form).map((key2,index)=>{
+    Object.keys(this.data.mainData).map((key, index) => {
+      Object.keys(this.data.form).map((key2, index) => {
         if (key === key2) {
           that.data.form[key2] = that.data.mainData[key2]
         }
       })
     })
     this.setData({
-      form:this.data.form
+      form: this.data.form
     })
   },
-
   // 跳转到添加人员
-  addTrainers () {
+  addTrainers() {
     wx.navigateTo({
       url: '/Eservice/addTrainers/index',
     })
@@ -139,79 +136,75 @@ Page({
     this.data.mainData.trainers = this.data.form.trainers
     this.setData({
       // form:this.data.form,
-      mainData:this.data.mainData
+      mainData: this.data.mainData
     })
     this.updateNode()
   },
   // 删除人员
-  deleteMenber (data) {
-    this.data.mainData.trainers = this.data.mainData.trainers.filter(e=>{
+  deleteMenber(data) {
+    this.data.mainData.trainers = this.data.mainData.trainers.filter(e => {
       return e.sa_workorder_node_teamid !== data.detail.sa_workorder_node_teamid
     })
     this.data.form.trainers = this.data.mainData.trainers
     this.setData({
-      form:this.data.form,
-      mainData:this.data.mainData
+      form: this.data.form,
+      mainData: this.data.mainData
     })
-    
+
     this.updateNode()
   },
   // 跳转到物料添加
-  addProduct () {
+  addProduct() {
     wx.navigateTo({
       url: '/Eservice/serviceMaterial/index',
     })
   },
-
   // 添加物料
   getAdd(selection) {
-
-    this.data.form.traintitem = selection.map(e=>{
+    this.data.form.traintitem = selection.map(e => {
       return {
-        "itemname":e.itemname,
-        "itemid":e.itemid,
-        "model":e.model,
-        "spec":e.spec,
-        "qty":1
+        "itemname": e.itemname,
+        "itemid": e.itemid,
+        "model": e.model,
+        "spec": e.spec,
+        "qty": 1
       }
     })
     this.setData({
-      titems:this.data.form.traintitem
+      titems: this.data.form.traintitem
     })
     this.updateNode()
   },
-
   // 修改物料数量
-  qtyChange (data) {
+  qtyChange(data) {
     clearTimeout(this.data.timerid)
-    this.data.timerid = setTimeout(()=>{
-      this.data.titems.forEach(e=>{
+    this.data.timerid = setTimeout(() => {
+      this.data.titems.forEach(e => {
         if (e.itemid == data.detail.itemid) {
           e.qty = data.detail.qty
         }
       })
-      
+
       this.setData({
         titems: this.data.titems
       })
       this.updateNode()
-    },1000)
+    }, 1000)
     this.setData({
-      timerid:this.data.timerid
+      timerid: this.data.timerid
     })
-    
+
   },
   // 删除物料
-  deleteMaterial (data) {
+  deleteMaterial(data) {
     this.setData({
-      titems:this.data.titems.filter(e=>{
+      titems: this.data.titems.filter(e => {
         return e.itemid !== data.detail.itemid
       })
     })
-    
+
     this.updateNode()
   },
-  
   /**
    * 生命周期函数--监听页面加载
    */
@@ -221,66 +214,79 @@ Page({
     this.data.bindNormalData.ownerid = options.id
     this.data.bindSignNameData.ownerid = options.id
     this.setData({
-      bindContractData:this.data.bindContractData,
-      bindNormalData:this.data.bindNormalData,
-      bindSignNameData:this.data.bindSignNameData,
-      sa_workorder_nodeid:options.id,
-      sa_workorderid:options.wid,
-      stopClick:options.class
+      bindContractData: this.data.bindContractData,
+      bindNormalData: this.data.bindNormalData,
+      bindSignNameData: this.data.bindSignNameData,
+      sa_workorder_nodeid: options.id,
+      sa_workorderid: options.wid,
+      stopClick: options.class
+    })
+    this.nodeDetail();
+    let page = getCurrentPages()[getCurrentPages().length - 2];
+    if (page.__route__ == 'Eservice/workOrderDetail/index') this.setData({
+      workers: page.data.billData.team
     })
-    this.nodeDetail()
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady() {
-
   },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
   onShow() {
     this.setData({
-      SignName:true
+      SignName: true
     })
   },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
   onHide() {
     this.setData({
-      SignName:false
+      SignName: false
     })
   },
 
   /**
-   * 生命周期函数--监听页面卸载
+   * 开始添加成员或者取消添加
    */
-  onUnload() {
-
+  showTeamDialog() {
+    this.setData({
+      showTeams: !this.data.showTeams,
+      teams: this.data.mainData.team.map(v => {
+        return v.isleader == 1 ? 0 : v.userid
+      })
+    })
   },
-
   /**
-   * 页面相关事件处理函数--监听用户下拉动作
+   * 选择添加成员
    */
-  onPullDownRefresh() {
-
+  selectTeams(e) {
+    const {
+      userid
+    } = e.currentTarget.dataset.item;
+    let teams = this.data.teams;
+    let i = teams.findIndex(v => v == userid);
+    if (i != -1) {
+      teams = teams.filter(v => v != userid)
+    } else {
+      teams.push(userid)
+    }
+    this.setData({
+      teams
+    })
   },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom() {
+  addUser(init = true) {
+    api._post({
+      "id": 20220930103603,
+      "content": {
+        ownertable: 'sa_workorder_node',
+        ownerid: this.data.mainData.sa_workorder_nodeid,
+        "userids": this.data.teams
+      }
+    }).then(res => {
+      console.log("添加成员", res)
+      wx.showToast({
+        title: res.msg == '成功' ? '修改成功' : res.msg,
+        icon: "none",
+        mask: true
+      });
+      if (res.msg == '成功') {
+        this.nodeDetail();
+        if (init) this.showTeamDialog();
+      }
+    })
 
   },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage() {
-
-  }
 })

+ 2 - 1
Eservice/nodeDetail/index.json

@@ -8,6 +8,7 @@
     "sign-name":"../components/signName/index",
     "product-card": "../components/productCard/index",
     "menber-card": "../components/menberCard/index",
-    "image-viewer":"../components/imageViewer/index"
+    "image-viewer":"../components/imageViewer/index",
+    "t-dialog": "tdesign-miniprogram/dialog/dialog"
   }
 }

+ 34 - 20
Eservice/nodeDetail/index.wxml

@@ -1,13 +1,13 @@
-
 <view class="{{stopClick}}" style="padding:10px">
   <card>
     <view slot="content">
       {{mainData.workpresetjson.workname}}
       <view class="flex-align-center">
-        <t-tag variant="dark" class="mr-5" theme="{{mainData.status == 0?'danger':mainData.status == 1?'success':'primary'}}" size="small">{{mainData.status == 0?'未完成':mainData.status == 1?'完成':'进行中'}}</t-tag> <t-tag wx:if="{{mainData.finishby}}" variant="dark" theme="primary" size="small">{{mainData.finishby}}</t-tag>
+        <t-tag variant="dark" class="mr-5" theme="{{mainData.status == 0?'danger':mainData.status == 1?'success':'primary'}}" size="small">{{mainData.status == 0?'未完成':mainData.status == 1?'完成':'进行中'}}</t-tag>
+        <t-tag wx:if="{{mainData.finishby}}" variant="dark" theme="primary" size="small">{{mainData.finishby}}</t-tag>
       </view>
     </view>
-    
+
   </card>
   <view style="margin-bottom: 5px;" class="small"><text class="label">工序说明</text></view>
   <card>
@@ -16,9 +16,10 @@
     </view>
   </card>
   <view style="margin-bottom: 5px;" class="small"><text class="label">参与人</text></view>
+
   <card>
     <text class="label">参与人:</text>
-    <view slot="content">
+    <view slot="content" bindtap="showTeamDialog">
       <view wx:if="{{mainData.team.length === 0}}">
         <text class="small">暂无参与人</text>
       </view>
@@ -27,6 +28,19 @@
       </view>
     </view>
   </card>
+
+  <t-dialog visible="{{showTeams}}" title="参与成员" confirm-btn="确定" cancel-btn="取消" bind:confirm="addUser" bind:cancel="showTeamDialog">
+    <view slot="content">
+      <view style="height: 40rpx;" />
+      <view>
+        <block wx:for="{{workers}}" wx:key="userid">
+          <t-tag class="mr-5 mt-5" variant="{{wqp.query(teams,item.userid)?'dark':'outline'}}" theme="primary" data-item="{{item}}" bindtap="selectTeams">{{ item.position?item.position + '-':'' }}{{ item.name }}</t-tag>
+        </block>
+      </view>
+    </view>
+  </t-dialog>
+  <wxs src="../../utils/wxmlQueryPer.wxs" module="wqp" />
+
   <!-- 是否确认 -->
   <view wx:if="{{mainData.workpresetjson.confirm !== 0}}">
     <view style="margin-bottom: 5px;" class="small">
@@ -42,8 +56,8 @@
   <!-- 上传附件 -->
   <view wx:if="{{mainData.workpresetjson.fileupload !== 0}}">
     <view style="margin-bottom: 5px;" class="small">
-    <text class="label">上传附件</text>
-    <text wx:if="{{mainData.workpresetjson.fileupload == 11}}" style="color:#e34d59">*</text>
+      <text class="label">上传附件</text>
+      <text wx:if="{{mainData.workpresetjson.fileupload == 11}}" style="color:#e34d59">*</text>
     </view>
     <card>
       <view style="flex:1" slot="content">
@@ -55,20 +69,20 @@
   <!-- 文本信息 -->
   <view wx:if="{{mainData.workpresetjson.textedit !== 0}}">
     <view style="margin-bottom: 5px;" class="small">
-    <text class="label">文本信息</text>
-    <text wx:if="{{mainData.workpresetjson.textedit == 11}}" style="color:#e34d59">*</text>
+      <text class="label">文本信息</text>
+      <text wx:if="{{mainData.workpresetjson.textedit == 11}}" style="color:#e34d59">*</text>
     </view>
     <card>
       <view style="flex:1" slot="content">
-        <t-textarea custom-style="padding:0" value="{{form.textcontent}}" t-class="external-class" placeholder="请输入文字" disableDefaultPadding="{{true}}" bind:blur="textContent" autosize/>
+        <t-textarea custom-style="padding:0" value="{{form.textcontent}}" t-class="external-class" placeholder="请输入文字" disableDefaultPadding="{{true}}" bind:blur="textContent" autosize />
       </view>
     </card>
   </view>
   <!-- 上传合同 -->
   <view wx:if="{{mainData.workpresetjson.contractupload !== 0}}">
     <view style="margin-bottom: 5px;" class="small">
-    <text class="label">上传合同</text>
-    <text wx:if="{{mainData.workpresetjson.contractupload == 11}}" style="color:#e34d59">*</text>
+      <text class="label">上传合同</text>
+      <text wx:if="{{mainData.workpresetjson.contractupload == 11}}" style="color:#e34d59">*</text>
     </view>
     <card>
       <view style="flex:1" slot="content">
@@ -79,8 +93,8 @@
   <!-- 是否有偿 -->
   <view wx:if="{{mainData.workpresetjson.amountpay !== 0}}">
     <view style="margin-bottom: 5px;" class="small">
-    <text class="label">是否有偿</text>
-    <text wx:if="{{mainData.workpresetjson.amountpay == 11}}" style="color:#e34d59">*</text>
+      <text class="label">是否有偿</text>
+      <text wx:if="{{mainData.workpresetjson.amountpay == 11}}" style="color:#e34d59">*</text>
     </view>
     <card>
       <view style="flex:1" slot="content">
@@ -91,8 +105,8 @@
   <!-- 客户签字 -->
   <view wx:if="{{mainData.workpresetjson.signature !== 0 && SignName}}">
     <view style="margin-bottom: 5px;" class="small">
-    <text class="label">客户签字</text>
-    <text wx:if="{{mainData.workpresetjson.signature == 11}}" style="color:#e34d59">*</text>
+      <text class="label">客户签字</text>
+      <text wx:if="{{mainData.workpresetjson.signature == 11}}" style="color:#e34d59">*</text>
     </view>
     <card>
       <view style="flex:1" slot="content">
@@ -102,8 +116,8 @@
     </card>
   </view>
 
-   <!-- 物料及人员 -->
-   <view wx:if="{{mainData.workpresetjson.additem !== 0 || mainData.workpresetjson.addperson !== 0}}">
+  <!-- 物料及人员 -->
+  <view wx:if="{{mainData.workpresetjson.additem !== 0 || mainData.workpresetjson.addperson !== 0}}">
     <view style="margin-bottom: 5px;" class="small"><text class="label">物料及人员</text></view>
     <card>
       <view style="flex:1" slot="content">
@@ -134,13 +148,13 @@
     <view style="margin-bottom: 5px;" class="small"><text class="label">备注</text></view>
     <card>
       <view style="flex:1" slot="content">
-        <t-textarea custom-style="padding:0" value="{{form.remarks}}" t-class="external-class" placeholder="请输入备注" disableDefaultPadding="{{true}}" bind:blur="remarkEdit" autosize/>
+        <t-textarea custom-style="padding:0" value="{{form.remarks}}" t-class="external-class" placeholder="请输入备注" disableDefaultPadding="{{true}}" bind:blur="remarkEdit" autosize />
       </view>
     </card>
   </view>
   <view wx:if="{{stopClick === 'undefined'}}">
     <t-button style="margin-bottom:10px" theme="primary" size="large" bind:tap="confirmBill" block>确认完成</t-button>
-    <t-button  theme="primary" size="large" bind:tap="updateNode" data-info="needBack" block>保存</t-button>
+    <t-button theme="primary" size="large" bind:tap="updateNode" data-info="needBack" block>保存</t-button>
   </view>
-  
+
 </view>

+ 2 - 1
Eservice/workOrder/index.json

@@ -3,7 +3,8 @@
     "t-tabs": "tdesign-miniprogram/tabs/tabs",
     "t-tab-panel": "tdesign-miniprogram/tab-panel/tab-panel",
     "card": "../components/listCard/listCard",
-    "t-empty": "tdesign-miniprogram/empty/empty"
+    "t-empty": "tdesign-miniprogram/empty/empty",
+    "t-tag": "tdesign-miniprogram/tag/tag"
 
   }
 }

+ 15 - 3
Eservice/workOrder/index.scss

@@ -2,13 +2,25 @@
   width: 100%;
   height: 100%;
 }
-.type{
+
+.type {
   padding: 5px;
   font-size: 22rpx;
-  color:#fff;
+  color: #fff;
   letter-spacing: 3px;
   writing-mode: vertical-lr;
   background: #4F7BFD;
   border-radius: 3px;
-  margin-right:5px ;
+  margin-right: 5px;
+}
+
+.flex-align-center {
+  position: relative;
+
+  .leader {
+    position: absolute;
+    top: -2rpx;
+    right: 0;
+    background: blue;
+  }
 }

+ 2 - 1
Eservice/workOrder/index.wxml

@@ -8,7 +8,7 @@
 <t-pull-down-refresh style="padding-bottom:60px" value="{{baseRefresh.value}}" loadingProps="{{loadingProps}}" loadingTexts="{{['下拉刷新', '松手刷新', '正在刷新', '刷新完成']}}" bind:refresh="onPullDownRefresh" bind:scrolltolower="onReachBottom">
   <view style="padding:10px">
     <view>
-      <card wx:for="{{list}}" url="{{'/Eservice/workOrderDetail/index?id=' + item.sa_workorderid}}" wx:key="index">
+      <card class="card" wx:for="{{list}}" url="{{'/Eservice/workOrderDetail/index?id=' + item.sa_workorderid}}" wx:key="index">
         <view style="width: 40px;" slot="left">
           <view class="type">{{item.type}}</view>
         </view>
@@ -30,6 +30,7 @@
           </view>
         </view>
         <view class="flex-align-center" slot="right">
+          <t-tag class="margin-16 leader" wx:for="{{item.isleader}}" size="small" variant="light-outline" theme="primary">我负责</t-tag>
           <view class="colorInfo small">
             {{item.status}}
           </view>

+ 66 - 7
Eservice/workerLeader/editworkOrderDetail/index.js

@@ -8,7 +8,9 @@ Page({
    * 页面的初始数据
    */
   data: {
-    workLeaderDialog: false
+    workLeaderDialog: false,
+    showTeams: false,
+    teams: []
   },
   async mainData() {
     const res = await api._post({
@@ -60,7 +62,6 @@ Page({
       .catch(() => console.log('点击了取消'))
       .finally(() => Dialog.close())
   },
-
   async addConfirmBill() {
     const res = await api._post({
       "id": "20230211105703",
@@ -105,16 +106,12 @@ Page({
       confirmBills: res.data
     })
   },
-
   toWorkConfirmInfo() {
     getApp().globalData.handelSelect = this
-
     wx.navigateTo({
       url: '/Eservice/workBillConfirmInfo/index?class=stopClick'
     })
   },
-
-
   async workerData() {
     const res = await api._post({
       "id": "20230213143003",
@@ -129,6 +126,58 @@ Page({
       workers: res.data
     })
   },
+  /**
+   * 开始添加成员或者取消添加
+   */
+  showTeamDialog() {
+    this.setData({
+      showTeams: !this.data.showTeams,
+      teams: this.data.billData.team.map(v => {
+        return v.isleader == 1 ? 0 : v.userid
+      })
+    })
+  },
+  /**
+   * 选择添加成员
+   */
+  selectTeams(e) {
+    const {
+      userid
+    } = e.currentTarget.dataset.item;
+    let teams = this.data.teams;
+    let i = teams.findIndex(v => v == userid);
+    if (i != -1) {
+      teams = teams.filter(v => v != userid)
+    } else {
+      teams.push(userid)
+    }
+    this.setData({
+      teams
+    })
+  },
+  addUser() {
+    api._post({
+      "id": 20220930103603,
+      "content": {
+        ownertable: 'sa_workorder',
+        ownerid: this.data.billData.sa_workorderid,
+        "userids": this.data.teams,
+        "justuserids": 1
+      }
+    }).then(res => {
+      console.log("添加成员", res)
+      wx.showToast({
+        title: res.msg == '成功' ? '修改成功' : res.msg,
+        icon: "none",
+        mask: true
+      });
+      if (res.msg == '成功') {
+        this.mainData()
+        this.showTeamDialog()
+      }
+    })
+
+  },
   showWorkerDialog() {
     this.setData({
       workLeaderDialog: !this.data.workLeaderDialog
@@ -146,11 +195,21 @@ Page({
         icon: 'none'
       })
     } else {
-      this.data.billData.projectlearders = [this.data.actLeader.userid]
+      /* this.data.billData.projectlearders = [this.data.actLeader.userid]
       const res = await api._post({
         "id": "20230208140003",
         "content": this.data.billData
+      }) */
+
+      const res = await api._post({
+        "id": "20220930103703",
+        "content": {
+          ownertable: 'sa_workorder',
+          ownerid: this.data.billData.sa_workorderid,
+          "userid": this.data.actLeader.userid
+        }
       })
+
       this.setData({
         workLeaderDialog: false
       })

+ 0 - 3
Eservice/workerLeader/editworkOrderDetail/index.scss

@@ -28,9 +28,6 @@ page {
 
 .tags {
   width: 100%;
-  display: flex !important;
-  justify-content: space-between !important;
-  height: 48rpx !important;
 }
 
 .mr-5 {

+ 21 - 4
Eservice/workerLeader/editworkOrderDetail/index.wxml

@@ -34,14 +34,20 @@
     </view>
   </card>
 
-  <view style="margin-bottom: 5px;" class="small"><text class="label">项目成员</text></view>
+  <view style="margin-bottom: 5px;display: flex;justify-content: space-between;" class="small"><text class="label">项目成员</text>
+    <view>
+      <t-tag class="mt-5" style="margin-right: 8rpx;" variant="outline" theme="warning" variant="dark" bind:click="showTeamDialog">
+        添加成员
+      </t-tag>
+      <t-tag class="mt-5" variant="outline" theme="warning" variant="dark" bind:click="showWorkerDialog">
+        修改负责人
+      </t-tag>
+    </view>
+  </view>
 
   <card>
     <view class="tags" slot="content">
       <t-tag class="mr-5 mt-5" wx:for="{{billData.team}}" wx:key="userid" variant="{{item.isleader === 1?'dark':'outline'}}" theme="{{item.isleader === 1?'primary':''}}">{{item.name}}</t-tag>
-      <t-tag class="mt-5" variant="outline" theme="warning" variant="dark" bind:click="showWorkerDialog">
-        修改负责人
-      </t-tag>
     </view>
   </card>
 
@@ -83,6 +89,17 @@
 
 <t-dialog id="t-dialog" />
 
+<t-dialog visible="{{showTeams}}" title="参与成员" confirm-btn="确定" cancel-btn="取消" bind:confirm="addUser" bind:cancel="showTeamDialog">
+  <view slot="content">
+    <view style="height: 40rpx;" />
+    <view>
+      <block wx:for="{{workers}}" wx:key="rowindex">
+        <t-tag wx:if="{{billData.projectleader!=item.name}}" class="mr-5 mt-5" variant="{{wqp.query(teams,item.userid)?'dark':'outline'}}" theme="primary" data-item="{{item}}" bindtap="selectTeams">{{ item.position?item.position + '-':'' }}{{ item.name }}</t-tag>
+      </block>
+    </view>
+  </view>
+</t-dialog>
+<wxs src="../../../utils/wxmlQueryPer.wxs" module="wqp" />
 <t-dialog visible="{{workLeaderDialog}}" title="转工单" confirm-btn="确定" cancel-btn="取消" bind:confirm="toWorker" bind:cancel="showWorkerDialog">
   <view slot="content">
     <view class="d-title">

+ 0 - 1
Universal/dataTeam/index.js

@@ -21,7 +21,6 @@ Page({
             content: {
                 ownertable,
                 ownerid,
-                nocache: true
             }
         }).then(res => {
             console.log(`数据团队${ownertable+ownerid}`, res)

+ 21 - 0
project.private.config.json

@@ -106,6 +106,27 @@
           "query": "",
           "launchMode": "default",
           "scene": null
+        },
+        {
+          "name": "工具退返申请",
+          "pathName": "packageA/returnOne/index",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "234234",
+          "pathName": "packageA/market/index",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "工单",
+          "pathName": "Eservice/workOrderDetail/index",
+          "query": "id=315",
+          "launchMode": "default",
+          "scene": null
         }
       ]
     }