소스 검색

修改状态颜色

xiaohaizhao 6 달 전
부모
커밋
6ba94da6c3

+ 1 - 1
Eservice/agent/serviceBillDetail/index.wxml

@@ -14,7 +14,7 @@
         </view>
     </view>
     <view class="small"><text class="label">{{language['服务单类型']||'服务单类型'}}:</text>{{orderMainData.servicetype}}</view>
-    <view class="small"><text class="label">{{language['服务单状态']||'服务单状态'}}:</text>{{orderMainData.status}}</view>
+    <view class="small"><text class="label">{{language['服务单状态']||'服务单状态'}}:</text><text style="color:{{sColors[orderMainData.status]}};">{{orderMainData.status}}</text></view>
     <view class="small"><text class="label">{{language['开始日期']||'开始日期'}}:</text>{{orderMainData.begdate}}</view>
     <view class="small"><text class="label">{{language['结束日期']||'结束日期'}}:</text>{{orderMainData.enddate}}</view>
     <view class="small"><text class="label">{{language['单据日期']||'单据日期'}}:</text>{{orderMainData.billdate||' --'}}</view>

+ 2 - 25
Eservice/agent/serviceBillList/index.wxml

@@ -16,7 +16,7 @@
                         <t-tag class="mr-5" wx:if="{{item.class1}}" variant="light" shape="round" theme="primary" size="small">{{language[item.class1]||item.class1}}</t-tag>
                         <t-tag class="mr-5" wx:if="{{item.class2}}" variant="light" shape="round" theme="primary" size="small">{{language[item.class2]||item.class2}}</t-tag>
                     </view>
-                    <text style="color: {{set.color(item.status)}};">{{language[item.status]||item.status}}</text>
+                    <text style="color:{{sColors[item.status]}};">{{language[item.status]||item.status}}</text>
                 </view>
                 <view class="card__body">
                     <view>{{language['服务地址']||'服务地址'}}:{{item.province}}{{item.city}}{{item.county}}{{item.address}}</view>
@@ -33,27 +33,4 @@
         <Yl_Empty wx:if="{{!list.length}}" />
         <t-fab icon="add" style="position:fixed;right:16px;bottom:72px" bind:click="handleClick" aria-label="{{language['增加']||'增加'}}"></t-fab>
     </view>
-</t-pull-down-refresh>
-
-<wxs module="set">
-    module.exports = {
-        color: function (statu) {
-            var color = '#999999';
-            switch (statu) {
-                case "待指派":
-                    color = '#3874f6';
-                    break;
-                case "待处理":
-                    color = '#e6a23c';
-                    break;
-                case "进行中":
-                    color = '#e6a23c';
-                    break;
-                case "已完成":
-                    color = '#67C23A';
-                    break;
-            };
-            return color;
-        }
-    }
-</wxs>
+</t-pull-down-refresh>

+ 1 - 1
Eservice/saler/serviceBillDetail/index.wxml

@@ -14,7 +14,7 @@
     </view>
   </view>
   <view class="small"><text class="label">{{language['服务单类型']||'服务单类型'}}:</text>{{orderMainData.servicetype}}</view>
-  <view class="small"><text class="label">{{language['服务单状态']||'服务单状态'}}:</text>{{orderMainData.status}}</view>
+  <view class="small"><text class="label">{{language['服务单状态']||'服务单状态'}}:</text><text style="color:{{sColors[orderMainData.status]}};">{{orderMainData.status}}</text></view>
   <view class="small"><text class="label">{{language['开始日期']||'开始日期'}}:</text>{{orderMainData.begdate}}</view>
   <view class="small"><text class="label">{{language['结束日期']||'结束日期'}}:</text>{{orderMainData.enddate}}</view>
   <view class="small"><text class="label">{{language['单据日期']||'单据日期'}}:</text>{{orderMainData.billdate}}</view>

+ 2 - 25
Eservice/saler/serviceBillList/index.wxml

@@ -23,7 +23,7 @@
           <t-tag class="mr-5" wx:if="{{item.class1}}" variant="light" shape="round" theme="primary" size="small">{{language[item.class1]||item.class1}}</t-tag>
           <t-tag class="mr-5" wx:if="{{item.class2}}" variant="light" shape="round" theme="primary" size="small">{{language[item.class2]||item.class2}}</t-tag>
         </view>
-        <text style="color: {{set.color(item.status)}};">{{language[item.status]||item.status}}</text>
+        <text style="color: {{sColors[item.status]}};">{{language[item.status]||item.status}}</text>
       </view>
       <view class="card__body">
         <view>{{language['服务地址']||'服务地址'}}:{{item.province}}{{item.city}}{{item.county}}{{item.address}}</view>
@@ -39,27 +39,4 @@
   </t-card>
   <t-fab icon="add" style="position:fixed;right:16px;bottom:32px" bind:click="handleClick" aria-label="{{language['增加']||'增加'}}"></t-fab>
 </view>
-</t-pull-down-refresh>
-
-<wxs module="set">
-    module.exports = {
-        color: function (statu) {
-            var color = '#999999';
-            switch (statu) {
-                case "待指派":
-                    color = '#3874f6';
-                    break;
-                case "待处理":
-                    color = '#e6a23c';
-                    break;
-                case "进行中":
-                    color = '#e6a23c';
-                    break;
-                case "已完成":
-                    color = '#67C23A';
-                    break;
-            };
-            return color;
-        }
-    }
-</wxs>
+</t-pull-down-refresh>

+ 1 - 1
Eservice/workerLeader/serviceBillDetail/index.wxml

@@ -14,7 +14,7 @@
     </view>
   </view>
   <view class="small"><text class="label">{{language['服务单类型']||'服务单类型'}}:</text>{{orderMainData.servicetype}}</view>
-  <view class="small"><text class="label">{{language['服务单状态']||'服务单状态'}}:</text>{{orderMainData.status}}</view>
+  <view class="small"><text class="label">{{language['服务单状态']||'服务单状态'}}:</text><text style="color:{{sColors[orderMainData.status]}};">{{orderMainData.status}}</text></view>
   <view class="small"><text class="label">{{language['开始日期']||'开始日期'}}:</text>{{orderMainData.begdate}}</view>
   <view class="small"><text class="label">{{language['结束日期']||'结束日期'}}:</text>{{orderMainData.enddate}}</view>
   <view class="small"><text class="label">{{language['单据日期']||'单据日期'}}:</text>{{orderMainData.billdate||' --'}}</view>

+ 2 - 25
Eservice/workerLeader/serviceBillList/index.wxml

@@ -16,7 +16,7 @@
             <t-tag class="mr-5" wx:if="{{item.class1}}" variant="light" shape="round" theme="primary" size="small">{{language[item.class1]||item.class1}}</t-tag>
             <t-tag class="mr-5" wx:if="{{item.class1}}" variant="light" shape="round" theme="primary" size="small">{{language[item.class1]||item.class1}}</t-tag>
           </view>
-          <text style="color: {{set.color(item.status)}};">{{language[item.status]||item.status}}</text>
+          <text style="color: {{sColors[item.status]}};">{{language[item.status]||item.status}}</text>
         </view>
         <view class="card__body">
           <view>{{language['服务地址']||'服务地址'}}:{{item.province}}{{item.city}}{{item.county}}{{item.address}}</view>
@@ -34,27 +34,4 @@
 
     <t-fab icon="add" style="position:fixed;right:16px;bottom:72px" bind:click="handleClick" aria-label="{{language['增加']||'增加'}}"></t-fab>
   </view>
-</t-pull-down-refresh>
-
-<wxs module="set">
-    module.exports = {
-        color: function (statu) {
-            var color = '#999999';
-            switch (statu) {
-                case "待指派":
-                    color = '#3874f6';
-                    break;
-                case "待处理":
-                    color = '#e6a23c';
-                    break;
-                case "进行中":
-                    color = '#e6a23c';
-                    break;
-                case "已完成":
-                    color = '#67C23A';
-                    break;
-            };
-            return color;
-        }
-    }
-</wxs>
+</t-pull-down-refresh>

+ 2 - 23
packageA/betweenFee/modules/list/index.wxml

@@ -1,6 +1,6 @@
 <navigator url="#" class="item" wx:for="{{list}}" wx:key="sonum">
     <view class="top">
-        {{language['单据日期']||'单据日期'}} : {{item.billdate || ' --'}} <text style="color:{{set.color(item.status)}}">{{language[item.status]||item.status}}</text>
+        {{language['单据日期']||'单据日期'}} : {{item.billdate || ' --'}} <text style="color:{{sColors[item.status]}};">{{language[item.status]||item.status}}</text>
     </view>
     <view class="content">
         <view class="num">
@@ -24,25 +24,4 @@
     </view>
 </navigator>
 
-<Yl_Empty wx:if="{{list.length==0}}" />
-
-
-<wxs module="set">
-    module.exports = {
-        color: function (statu) {
-            var color = '#999999';
-            switch (statu) {
-                case "审核":
-                    color = '#e6a23c';
-                    break;
-                case "提交":
-                    color = '#e6a23c';
-                    break;
-                case "新建":
-                    color = '#3874f6';
-                    break;
-            };
-            return color;
-        }
-    }
-</wxs>
+<Yl_Empty wx:if="{{list.length==0}}" />

+ 1 - 1
packageA/borrow/detail.wxml

@@ -10,7 +10,7 @@
     </view>
     <view class="exp">{{language['订单类型']||'订单类型'}}:{{detail.type}}</view>
     <view class="exp">{{language['单据日期']||'单据日期'}}:{{detail.billdate || language['暂无']||'暂无'}}</view>
-    <view class="exp">{{language['订单状态']||'订单状态'}}:{{language[detail.status]||detail.status}}</view>
+    <view class="exp">{{language['订单状态']||'订单状态'}}:<text style="color:{{sColors[detail.status]}};">{{language[detail.status]||detail.status}}</text></view>
     <view wx:if="{{detail.sa_contractid}}" class="exp">{{language['借用套数']||'借用套数'}}:{{detail.toolcount}}{{language['套']||'套'}}</view>
     <view class="exp">{{language['订单金额']||'订单金额'}}:{{detail.amount}}{{language['元']||'元'}}</view>
 

+ 2 - 29
packageA/borrow/modules/list/index.wxml

@@ -1,7 +1,7 @@
 <navigator url="/packageA/borrow/detail?id={{item.sa_orderid}}" class="item" wx:for="{{list}}" wx:key="sonum">
     <view class="top">
         {{language['单据日期']||'单据日期'}}:{{item.billdate}}
-        <view style="color: {{set.color(item.status)}};">
+        <view style="color:{{sColors[item.status]}};">
             {{language[item.status]||item.status}}
         </view>
     </view>
@@ -30,31 +30,4 @@
     </view>
 </navigator>
 
-<Yl_Empty wx:if="{{list.length==0}}" />
-
-<wxs module="set">
-    module.exports = {
-        color: function (statu) {
-            var color = '#999999';
-            switch (statu) {
-                case "新建":
-                    color = '#3874f6';
-                    break;
-                case "提交":
-                    color = '#e6a23c';
-                    break;
-                case "交期待确认":
-                    color = '#e6a23c';
-                    break;
-                case "交期确认":
-                    color = '#67C23A';
-                    break;
-                case "审核":
-                    color = '#e6a23c';
-                    break;
-
-            };
-            return color;
-        }
-    }
-</wxs>
+<Yl_Empty wx:if="{{list.length==0}}" />

+ 2 - 1
packageA/invoice/detail.js

@@ -90,7 +90,8 @@ Page({
         }];
         let list2 = [{
             label: "状态",
-            value: item.status
+            value: item.status,
+            style:`color:${this.data.sColors[item.status]}`
         }, {
             label: "创建人",
             value: item.createby

+ 1 - 1
packageA/invoice/detail.wxml

@@ -4,7 +4,7 @@
 	<view class="num">
 		{{detail.billno}}
 	</view>
-	<view class="exp">{{language['状态']||'状态'}}:{{language[detail.status]||detail.status}}</view>
+	<view class="exp">{{language['状态']||'状态'}}:<text style="color:{{sColors[detail.status]}};">{{language[detail.status]||detail.status}}</text></view>
 	<view class="exp">{{language['创建日期']||'创建日期'}}:{{detail.createdate}}</view>
 	<view class="exp">{{language['开票单位']||'开票单位'}}:{{detail.enterprisename|| "--"}}</view>
 	<view class="exp">{{language['备注']||'备注'}}:{{detail.remarks || "--"}}</view>

+ 2 - 21
packageA/invoice/modules/list/index.wxml

@@ -1,6 +1,6 @@
 <navigator url="/packageA/invoice/detail?id={{item.sa_invoiceapplyid}}" class="item" wx:for="{{list}}" wx:key="sa_invoiceapplyid">
     <view class="top">
-        {{language['提交日期']||'提交日期'}}:{{item.submitdate || ' --'}} <text style="color: {{set.color(item.status)}};">{{language[item.status]||item.status}}</text>
+        {{language['提交日期']||'提交日期'}}:{{item.submitdate || ' --'}} <text style="color:{{sColors[item.status]}};">{{language[item.status]||item.status}}</text>
     </view>
     <view class="content">
         <view class="num">
@@ -34,23 +34,4 @@
         </view>
     </view>
 </navigator>
-<Yl_Empty wx:if="{{list.length==0}}" />
-<wxs module="set">
-    module.exports = {
-        color: function (statu) {
-            var color = '#999999';
-            switch (statu) {
-                case "新建":
-                    color = '#3874f6';
-                    break;
-                case "提交":
-                    color = '#e6a23c';
-                    break;
-                case "审核":
-                    color = '#e6a23c';
-                    break;
-            };
-            return color;
-        }
-    }
-</wxs>
+<Yl_Empty wx:if="{{list.length==0}}" />

+ 3 - 3
packageA/orderForm/detail.wxml

@@ -13,11 +13,11 @@
 	<view class="exp" wx:if="{{userrole!='经销商'}}">{{language['企业']||'企业'}}:{{detail.enterprisename || ' --'}}</view>
 	<view class="exp" wx:if="{{detail.type=='项目订单'}}">{{language['关联项目']||'关联项目'}}:{{detail.projectname || language['暂无']||'暂无'}}</view>
 	<view class="exp">{{language['订单类型']||'订单类型'}}:{{language[detail.type]||detail.type}}</view>
-	<view class="exp">{{language['订单状态']||'订单状态'}}:{{language[detail.status]||detail.status}}</view>
+	<view class="exp">{{language['订单状态']||'订单状态'}}:<text style="color:{{sColors[detail.status]}};">{{language[detail.status]||detail.status}}</text></view>
 	<view class="exp">{{language['单据日期']||'单据日期'}}:{{detail.billdate || language['暂无']||'暂无'}}</view>
 	<view class="exp">{{language['创建日期']||'创建日期'}}:{{detail.createdate}}</view>
-	<view class="exp">{{language['核销状态']||'核销状态'}}:{{language[detail.writeoffstatus]||detail.writeoffstatus}}</view>
-	<view class="exp">{{language['开票状态']||'开票状态'}}:{{language[detail.invoicestatus]||detail.invoicestatus}}</view>
+	<view class="exp">{{language['核销状态']||'核销状态'}}:<text style="color:{{sColors[detail.writeoffstatus]}};">{{language[detail.writeoffstatus]||detail.writeoffstatus}}</text></view>
+	<view class="exp">{{language['开票状态']||'开票状态'}}:<text style="color:{{sColors[detail.invoicestatus]}};">{{language[detail.invoicestatus]||detail.invoicestatus}}</text></view>
 	<van-button custom-class='copy' bindtap="copyItem">{{language['一键复制订单']||'一键复制订单'}}</van-button>
 </view>
 

+ 2 - 28
packageA/orderForm/modules/list/index.wxml

@@ -5,7 +5,7 @@
             <text wx:if="{{language[item.brandName]||item.brandName}}">{{language[item.brandname]||item.brandname}}</text>
             <text wx:if="{{item.tradefield}}">{{language[item.tradefield]||item.tradefield}}</text>
         </view>
-        <view class="statu" style="color: {{set.color(item.status)}};">
+        <view class="statu" style="color: {{sColors[item.status]}};">
             {{language[item.status]||item.status}}
         </view>
     </view>
@@ -40,30 +40,4 @@
     </view>
 </navigator>
 
-<Yl_Empty wx:if="{{list.length==0}}" />
-<wxs module="set">
-    module.exports = {
-        color: function (statu) {
-            var color = '#999999';
-            switch (statu) {
-                case "新建":
-                    color = '#3874f6';
-                    break;
-                case "提交":
-                    color = '#e6a23c';
-                    break;
-                case "交期待确认":
-                    color = '#e6a23c';
-                    break;
-                case "交期确认":
-                    color = '#67C23A';
-                    break;
-                case "审核":
-                    color = '#e6a23c';
-                    break;
-
-            };
-            return color;
-        }
-    }
-</wxs>
+<Yl_Empty wx:if="{{list.length==0}}" />

+ 2 - 1
packageA/remitVoucher/detail.js

@@ -87,7 +87,8 @@ Page({
 				value: data.billno
 			}, {
 				label: "状态",
-				value: getApp().globalData.Language.getMapText(data.status)
+				value: getApp().globalData.Language.getMapText(data.status),
+				style:`color:${this.data.sColors[data.status]}`
 			}, {
 				label: "经销商编号",
 				value: data.agentnum

+ 1 - 1
packageA/remitVoucher/detail.wxml

@@ -5,7 +5,7 @@
 	<view class="num">
 		{{detail.billno}}
 	</view>
-	<view class="exp">{{language['状态']||'状态'}}:{{language[detail.status]||detail.status}}</view>
+	<view class="exp" style="color:{{sColors[detail.status]}};">{{language['状态']||'状态'}}:{{language[detail.status]||detail.status}}</view>
 	<view class="exp">{{language['经销商编号']||'经销商编号'}}:{{detail.agentnum}}</view>
 	<view class="exp">{{language['经销商简称']||'经销商简称'}}:{{detail.enterprisename}}</view>
 	<view class="exp">{{language['付款人']||'付款人'}}:{{ detail.payer}}</view>

+ 2 - 22
packageA/remitVoucher/modules/list.wxml

@@ -1,6 +1,6 @@
 <navigator url="/packageA/remitVoucher/detail?id={{item.sa_paybillid}}" class="item" wx:for="{{list}}" wx:key="billno">
     <view class="top">
-        {{language['付款时间']||'付款时间'}} : {{item.paydate || ' --'}} <text style="color:{{set.color(item.status)}}">{{language[item.status]||item.status}}</text>
+        {{language['付款时间']||'付款时间'}} : {{item.paydate || ' --'}} <text style="color:{{sColors[item.status]}};">{{language[item.status]||item.status}}</text>
     </view>
     <view class="content">
         <view class="num">
@@ -23,24 +23,4 @@
         </view>
     </view>
 </navigator>
-<Yl_Empty wx:if="{{list.length==0}}" />
-
-<wxs module="set">
-    module.exports = {
-        color: function (statu) {
-            var color = '#999999';
-            switch (statu) {
-                case "审核":
-                    color = '#e6a23c';
-                    break;
-                case "提交":
-                    color = '#e6a23c';
-                    break;
-                case "新建":
-                    color = '#3874f6';
-                    break;
-            };
-            return color;
-        }
-    }
-</wxs>
+<Yl_Empty wx:if="{{list.length==0}}" />

+ 2 - 1
packageA/returnOne/detail.js

@@ -80,7 +80,8 @@ Page({
         value: data.billdate
       }, {
         label: "状态",
-        value: getApp().globalData.Language.getMapText(data.status)
+        value: getApp().globalData.Language.getMapText(data.status),
+        style:`color:${this.data.sColors[data.status]}`
       }, {
         label: '来源单号',
         value: data.sonum

+ 1 - 1
packageA/returnOne/detail.wxml

@@ -12,7 +12,7 @@
 	<view class="exp">{{language['订单使用返利金占比']||'订单使用返利金占比'}}:{{detail.rebate_userate+'%'}}</view>
 	<view class="exp">{{language['是否实物退回']||'是否实物退回'}}:{{detail.isitemreturn==1?(language['是']||'是'):(language['否']||'否')}}</view>
 	<view class="exp">{{language['订单账户']||'订单账户'}}:{{detail.accountname||"--"}}</view>
-	<view class="exp">{{language['订单状态']||'订单状态'}}:{{language[detail.status]||detail.status}}</view>
+	<view class="exp">{{language['订单状态']||'订单状态'}}:<text style="color:{{sColors[detail.status]}};">{{language[detail.status]||detail.status}}</text></view>
 </view>
 
 <Yl_FunTabs list='{{tabsList}}' active='{{tabsActive}}' bind:onChenge="tabsChange">

+ 2 - 22
packageA/returnOne/modules/list/index.wxml

@@ -1,7 +1,7 @@
 <navigator url="/packageA/returnOne/detail?id={{item.sa_aftersalesmagid}}" class="item" wx:for="{{list}}" wx:key="sonum">
 	<view class="top">
 		{{language['单据日期']||'单据日期'}}:{{item.billdate}}
-		<view style="color: {{set.color(item.status)}};">
+		<view style="color:{{sColors[item.status]}};">
 			{{language[item.status]||item.status}}
 		</view>
 	</view>
@@ -30,24 +30,4 @@
 	</view>
 </navigator>
 
-<Yl_Empty wx:if="{{list.length==0}}" />
-
-<wxs module="set">
-	module.exports = {
-		color: function (statu) {
-			var color = '#F56C6C';
-			switch (statu) {
-				case "审核":
-					color = '#e6a23c';
-					break;
-				case "提交":
-					color = '#3874f6';
-					break;
-				case "新建":
-					color = '#3874f6';
-					break;
-			};
-			return color;
-		}
-	}
-</wxs>
+<Yl_Empty wx:if="{{list.length==0}}" />

+ 1 - 1
packageA/toolBill/detail.wxml

@@ -5,7 +5,7 @@
 	<view class="num">
 		{{detail.billno}}
 	</view>
-	<view class="exp">{{language['状态']||'状态'}}:{{language[detail.status]||detail.status || '--'}}</view>
+	<view class="exp">{{language['状态']||'状态'}}:<text style="color:{{sColors[detail.status]}};">{{language[detail.status]||detail.status || '--'}}</text></view>
 	<view class="exp">{{language['单据日期']||'单据日期'}}:{{detail.billdate || '--'}}</view>
 	<view class="exp">{{language['来源单号']||'来源单号'}}:{{detail.sonum || '--'}}</view>
 	<view class="exp">{{language['是否实物返回']||'是否实物返回'}}:{{detail.isitemreturn ? language['是']||'是' : language['否']|| '否'}}</view>

+ 1 - 25
packageA/toolBill/modules/list/index.wxml

@@ -1,6 +1,6 @@
 <navigator url="/packageA/toolBill/detail?id={{item.sa_aftersalesmagid}}" class="item" wx:for="{{list}}" wx:key="sonum">
     <view class="top">
-        {{language['单据日期']||'单据日期'}} : {{item.billdate || ' --'}} <text style="color:{{set.color(item.status)}}">{{language[item.status]||item.status}}</text>
+        {{language['单据日期']||'单据日期'}} : {{item.billdate || ' --'}} <text style="color:{{sColors[item.status]}};">{{language[item.status]||item.status}}</text>
     </view>
     <view class="content">
         <view class="num">
@@ -32,27 +32,3 @@
 </navigator>
 
 <Yl_Empty wx:if="{{list.length==0}}" />
-
-
-<wxs module="set">
-    module.exports = {
-        color: function (statu) {
-            var color = '#999999';
-            switch (statu) {
-                case "审核":
-                    color = '#F56C6C';
-                    break;
-                case "提交":
-                    color = '#3874f6';
-                    break;
-                case "新建":
-                    color = '#3874f6';
-                    break;
-                case "复核":
-                    color = '#f56c6c';
-                    break;
-            };
-            return color;
-        }
-    }
-</wxs>