暂存

Eservice/api/http.js

@@ -1,17 +1,8 @@
 var app = getApp(); //引入全局app.js，我们可以在globalData中定义一些公用的数据，比如baseUrl、token
 
 const request = function (url = "", options) {
-<<<<<<< HEAD
   const baseUrl = "http://61.164.207.46:8000/yos/rest/index" + url;
   // const baseUrl = "http://122.226.136.204:8082/yos/rest/index" + url;
-=======
-  // const baseUrl = "http://61.164.207.46:8000/yos/rest/index" + url;
-  const baseUrl = "http://122.226.136.204:8082/yos/rest/index" + url;
-
-//   const baseUrl = "https://oms.idcgroup.com.cn:8079/yos/rest/index" + url;
-
-  console.log(baseUrl)
->>>>>>> 462eff694c7055755ed096669c0c8b22d191195c
   options.data.accesstoken = wx.getStorageSync('userMsg').token
   return new Promise((resolve, reject) => {
     wx.request({

Eservice/workOrder/index.json

@@ -2,6 +2,8 @@
   "usingComponents": {
     "t-tabs": "tdesign-miniprogram/tabs/tabs",
     "t-tab-panel": "tdesign-miniprogram/tab-panel/tab-panel",
-    "card": "../components/listCard/listCard"
+    "card": "../components/listCard/listCard",
+    "t-empty": "tdesign-miniprogram/empty/empty"
+
   }
 }

Eservice/workOrder/index.wxml

@@ -39,6 +39,7 @@
         </view>
       </view>
     </card>
+    <t-empty wx:if="{{list.length === 0}}" icon="root-list" t-class="empty-cls" t-class-image="t-empty__image" description="暂无工单" />
   </view>
 </view>
 </t-pull-down-refresh>

Eservice/workOrderDetail/index.wxml

@@ -31,6 +31,12 @@
       <view class="small"><text class="label">结束时间:</text>{{billData.enddate}}</view>
     </view>
   </card>
+  <card >
+  <view slot="content">
+    <view class="small"><text class="label">业务员:</text>{{billData.scenecontactrole}}</view>
+    <view class="small flex-align-center"><text class="label">联系电话:</text><t-call phone="{{billData.scenecontactphonenumber}}">{{billData.scenecontactphonenumber}}</t-call></view>
+  </view>
+  </card>
   <view style="margin-bottom: 5px;" class="small"><text class="label">项目成员</text></view>
   <card>
     <view slot="content">

Eservice/workerLeader/serviceBillDetail/index.js

@@ -8,6 +8,7 @@ Page({
    */
   data: {
     showWithInput:false,  
+    showProgress:false,
     showToWoker:false, 
     orderMainData:{},
     list:[],
@@ -260,6 +261,16 @@ Page({
       url: '/Eservice/workerLeader/editworkOrderDetail/index?id=' + id
     })
   },
+  async showProgressDialog () {
+    const res = await api._post({
+      id:"20230208140203",
+      content:{}
+    })
+    this.setData({
+      showProgress:!this.data.showProgress,
+      progress:res.data
+    })
+  },
   /**
    * 生命周期函数--监听页面加载
    */

Eservice/workerLeader/serviceBillDetail/index.json

@@ -12,7 +12,7 @@
     "t-textarea": "tdesign-miniprogram/textarea/textarea",
     "t-tag": "tdesign-miniprogram/tag/tag",
     "t-check-tag": "tdesign-miniprogram/check-tag/check-tag",
-    "t-cell": "tdesign-miniprogram/cell/cell"
-
+    "t-cell": "tdesign-miniprogram/cell/cell",
+    "t-divider": "tdesign-miniprogram/divider/divider"
   }
 }

Eservice/workerLeader/serviceBillDetail/index.scss

@@ -74,4 +74,7 @@ page{
   font-size: 26rpx;
   color:#999;
   margin-bottom: 5px;
+}
+.t-class{
+  box-shadow: 0px 5px 5px #333;
 }

Eservice/workerLeader/serviceBillDetail/index.wxml

@@ -76,6 +76,8 @@
   <t-tabs defaultValue="{{0}}" bind:change="onTabsChange" bind:click="onTabsClick" t-class="custom-tabs">
     <t-tab-panel label="关联工单" value="0">
       <t-cell wx:for="{{linkWorkOrders}}" wx:key="sa_serviceorderid" title="工单编号" note="{{item.billno}}" data-item="{{item}}" bind:click="tolinkWorkOrder" hover arrow />
+      <t-empty wx:if="{{linkWorkOrders.length === 0}}" icon="root-list" t-class="empty-cls" t-class-image="t-empty__image" description="暂无工单" />
+
     </t-tab-panel>
     <t-tab-panel wx:if="{{orderMainData.servicetype !== '售前' && orderMainData.servicetype !== '历史售后'}}" label="售后商品" value="1">
       <view style="padding:10px" wx:if="{{list.length === 0}}">
@@ -123,16 +125,42 @@
     </view>
     <view style="margin-bottom:10px">
       <block wx:for="{{templist}}" wx:key="rowindex">
-        <t-tag class="mr-5" variant="{{actTemp.sa_workorder_templateid === item.sa_workorder_templateid?'dark':'outline'}}" theme="primary" data-item="{{item}}" bindtap="selectTemp">{{ item.name }}</t-tag>
+        <t-tag class="mr-5 mt-5" variant="{{actTemp.sa_workorder_templateid === item.sa_workorder_templateid?'dark':'outline'}}" theme="primary" data-item="{{item}}" bindtap="selectTemp">{{ item.name }}</t-tag>
       </block>
     </view>
     <view class="d-title">
       选择负责人:
     </view>
-    <view>
+    <view class="mt-5">
       <block wx:for="{{workers}}" wx:key="rowindex">
-        <t-tag class="mr-10" variant="{{actLeader.userid === item.userid?'dark':'outline'}}" theme="primary" data-item="{{item}}" bindtap="selectLeader">{{  item.position?item.position + '-':'' }}{{ item.name }}</t-tag>
+        <t-tag class="mr-5 mt-5" variant="{{actLeader.userid === item.userid?'dark':'outline'}}" theme="primary" data-item="{{item}}" bindtap="selectLeader">{{  item.position?item.position + '-':'' }}{{ item.name }}</t-tag>
       </block>
     </view>
+
+    <t-button bind:tap="showProgressDialog" variant="primary" size="extra-small">查看人员进度</t-button>
+  </view>
+</t-dialog>
+
+<t-dialog
+  visible="{{showProgress}}"
+  title="进度"
+  confirm-btn="确定"
+  bind:confirm="showProgressDialog"
+  external-classes="['t-class']"
+  show-overlay="{{false}}"
+>
+  <view slot="content">
+    <scroll-view style="display: inline-block;width: 100%;height: 300px;" scroll-y>
+      <view  wx:for="{{progress}}" wx:key="rowindex">
+        <view class="small"><text class="label">姓名:</text>{{item.projectleader}}</view>
+        <view class="small"><text class="label">地址:</text>{{item.province}}{{item.city}}{{item.county}}{{item.address}}</view>
+        <view class="small"><text class="label">创建时间:</text>{{item.createdate}}</view>
+        <t-divider align="left" />
+      </view>
+      <t-empty wx:if="{{progress.length === 0}}" icon="root-list" t-class="empty-cls" t-class-image="t-empty__image" description="暂无进行中的人员" />
+
+    </scroll-view>
+    
+    
   </view>
 </t-dialog>

Eservice/workerLeader/serviceBillList/index.json

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

Eservice/workerLeader/serviceBillList/index.wxml

@@ -36,6 +36,8 @@
       </view>
     </view>
   </t-card>
+  <t-empty wx:if="{{list.length === 0}}" icon="root-list" t-class="empty-cls" t-class-image="t-empty__image" description="暂无数据" />
+
   <t-fab icon="add" style="position:fixed;right:16px;bottom:72px" bind:click="handleClick" aria-label="增加"></t-fab>
 </view>
 </t-pull-down-refresh>

app.js

@@ -57,10 +57,6 @@ App({
             that: null, //保存this
             callback: function () {}
         },
-<<<<<<< HEAD
         host:"http://61.164.207.46:8000"
-=======
-        host: "http://122.226.136.204:8082"
->>>>>>> 462eff694c7055755ed096669c0c8b22d191195c
     }
 })

miniprogram_npm/tdesign-miniprogram/upload/props.js

@@ -44,5 +44,9 @@ const props = {
         type: String,
         value: 'media',
     },
+    isdelete:{
+        type: Boolean,
+        value: true,
+    }
 };
 export default props;

miniprogram_npm/tdesign-miniprogram/upload/upload.wxml

@@ -51,7 +51,7 @@
           >
         </view>
         <!-- 删除 -->
-        <view class="{{classPrefix}}__close-btn hotspot-expanded" bindtap="onDelete" data-index="{{index}}">
+        <view wx:if="{{isdelete}}" class="{{classPrefix}}__close-btn hotspot-expanded" bindtap="onDelete" data-index="{{index}}">
           <t-icon name="close" size="16" color="#fff" />
         </view>
       </view>

utils/Http.js

@@ -1,12 +1,6 @@
 // const baseUrl = "https://meida.cnyunl.com/yos/rest/index";
-<<<<<<< HEAD
 const baseUrl = "http://61.164.207.46:8000/yos/rest/index";
 // const baseUrl = "http://122.226.136.204:8082/yos/rest/index";
-=======
-// const baseUrl = "http://61.164.207.46:8000/yos/rest/index";
-const baseUrl = "http://122.226.136.204:8082/yos/rest/index";
-// const baseUrl = "https://oms.idcgroup.com.cn:8079/yos/rest/index";
->>>>>>> 462eff694c7055755ed096669c0c8b22d191195c
 
 class HTTP {
     request({