diff --git a/components/orderCard.vue b/components/orderCard.vue
index 9e5936d..e948e17 100644
--- a/components/orderCard.vue
+++ b/components/orderCard.vue
@@ -81,6 +81,9 @@
作废
+
+ 添加项目
+
查看详情
@@ -244,6 +247,12 @@ export default {
ticketsStatus : '03'
}
},
+ /**
+ * 添加项目
+ */
+ addProj(order){
+ this.$emit('addProj',order);
+ },
/**
* 作废请求后台方法
@@ -286,7 +295,7 @@ export default {
@include flex;
align-items: center;
justify-content: center;
- padding: 15px;
+ padding: 30rpx 30rpx 120rpx 30rpx;
height: auto;
background-color: #fff;
}
diff --git a/pages-home/home/home.vue b/pages-home/home/home.vue
index e1f51cb..d37c797 100644
--- a/pages-home/home/home.vue
+++ b/pages-home/home/home.vue
@@ -96,7 +96,7 @@
-
+
@@ -104,6 +104,7 @@
+
@@ -112,6 +113,7 @@
import tabBarVue from '@/components/tabBar/tabBar.vue'
import VNavigationBar from '@/components/VNavigationBar.vue'
import OrderCard from "@/components/orderCard.vue";
+import ProjectPicker from "@/components/projectPicker.vue";
import config from '@/config'
import request from '@/utils/request';
import {formatTimestamp,getOrderStatusText,builderOrder,saveTicketsRecords} from "@/utils/utils";
@@ -119,13 +121,15 @@ import {
getToken,
getUserInfo,
getStrData,
- getTenantId
+ getTenantId,
+ setJSONData
} from '@/utils/auth'
export default {
components: {
OrderCard,
tabBarVue,
+ ProjectPicker,
VNavigationBar
},
data() {
@@ -180,6 +184,10 @@ export default {
noReadNum:0,
//通知公告数量
noticeNum:0,
+ //选中的维修单id
+ ticketId: null,
+ //新加的维修项目
+ selectedProj: [],
}
},
onLoad(){
@@ -217,7 +225,52 @@ export default {
}
},
methods: {
-
+ /**
+ * 添加项目
+ */
+ addProj(order){
+ this.ticketId = order.id
+ this.$refs.proj.open()
+ },
+ /**
+ * 添加项目回调
+ */
+ projConfirm(proj) {
+ this.selectedProj = proj
+ if(this.selectedProj.length>0){
+ setJSONData("newProject",this.selectedProj)
+ uni.navigateTo({
+ url: '/pages-home/service/sign-agin'
+ })
+ }
+ console.log(this.selectedProj,"selectedProj")
+ console.log(this.ticketId,"this.ticketId")
+ },
+ // 子表信息预处理
+ formatItem(list) {
+ if (!(list && list.length > 0)) {
+ return []
+ }
+ return list.map(item => {
+ const temp = {
+ ...item,
+ ticketId:this.ticketId,
+ itemName: item.name,
+ itemCount: 1,
+ itemUnit: item.unit,
+ itemPrice: item.price,
+ itemDiscount:1,
+ itemMoney: item.price,
+ itemTypeId: item.type,
+ remark: item.remark,
+ itemType: "01",
+ itemStatus:"01",
+ projectId: item.id,
+ id: null
+ }
+ return temp;
+ })
+ },
socketSuccess(){
this.getNoReadNum()
this.onRefresherrefresh()
diff --git a/pages-home/service/sign-agin.vue b/pages-home/service/sign-agin.vue
new file mode 100644
index 0000000..653947b
--- /dev/null
+++ b/pages-home/service/sign-agin.vue
@@ -0,0 +1,620 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 请签名
+
+
+
+
+
+
+
+
+
+
diff --git a/pages.json b/pages.json
index fae8af6..f1248f3 100644
--- a/pages.json
+++ b/pages.json
@@ -131,6 +131,12 @@
"navigationBarTitleText": ""
}
},
+ {
+ "path": "service/sign-agin",
+ "style": {
+ "navigationBarTitleText": ""
+ }
+ },
{
"path": "msg/message",
"style": {
diff --git a/uni_modules/song-data-picker/components/uni-icons/icons.js b/uni_modules/song-data-picker/components/uni-icons/icons.js
deleted file mode 100644
index 60b7332..0000000
--- a/uni_modules/song-data-picker/components/uni-icons/icons.js
+++ /dev/null
@@ -1,132 +0,0 @@
-export default {
- "pulldown": "\ue588",
- "refreshempty": "\ue461",
- "back": "\ue471",
- "forward": "\ue470",
- "more": "\ue507",
- "more-filled": "\ue537",
- "scan": "\ue612",
- "qq": "\ue264",
- "weibo": "\ue260",
- "weixin": "\ue261",
- "pengyouquan": "\ue262",
- "loop": "\ue565",
- "refresh": "\ue407",
- "refresh-filled": "\ue437",
- "arrowthindown": "\ue585",
- "arrowthinleft": "\ue586",
- "arrowthinright": "\ue587",
- "arrowthinup": "\ue584",
- "undo-filled": "\ue7d6",
- "undo": "\ue406",
- "redo": "\ue405",
- "redo-filled": "\ue7d9",
- "bars": "\ue563",
- "chatboxes": "\ue203",
- "camera": "\ue301",
- "chatboxes-filled": "\ue233",
- "camera-filled": "\ue7ef",
- "cart-filled": "\ue7f4",
- "cart": "\ue7f5",
- "checkbox-filled": "\ue442",
- "checkbox": "\ue7fa",
- "arrowleft": "\ue582",
- "arrowdown": "\ue581",
- "arrowright": "\ue583",
- "smallcircle-filled": "\ue801",
- "arrowup": "\ue580",
- "circle": "\ue411",
- "eye-filled": "\ue568",
- "eye-slash-filled": "\ue822",
- "eye-slash": "\ue823",
- "eye": "\ue824",
- "flag-filled": "\ue825",
- "flag": "\ue508",
- "gear-filled": "\ue532",
- "reload": "\ue462",
- "gear": "\ue502",
- "hand-thumbsdown-filled": "\ue83b",
- "hand-thumbsdown": "\ue83c",
- "hand-thumbsup-filled": "\ue83d",
- "heart-filled": "\ue83e",
- "hand-thumbsup": "\ue83f",
- "heart": "\ue840",
- "home": "\ue500",
- "info": "\ue504",
- "home-filled": "\ue530",
- "info-filled": "\ue534",
- "circle-filled": "\ue441",
- "chat-filled": "\ue847",
- "chat": "\ue263",
- "mail-open-filled": "\ue84d",
- "email-filled": "\ue231",
- "mail-open": "\ue84e",
- "email": "\ue201",
- "checkmarkempty": "\ue472",
- "list": "\ue562",
- "locked-filled": "\ue856",
- "locked": "\ue506",
- "map-filled": "\ue85c",
- "map-pin": "\ue85e",
- "map-pin-ellipse": "\ue864",
- "map": "\ue364",
- "minus-filled": "\ue440",
- "mic-filled": "\ue332",
- "minus": "\ue410",
- "micoff": "\ue360",
- "mic": "\ue302",
- "clear": "\ue434",
- "smallcircle": "\ue868",
- "close": "\ue404",
- "closeempty": "\ue460",
- "paperclip": "\ue567",
- "paperplane": "\ue503",
- "paperplane-filled": "\ue86e",
- "person-filled": "\ue131",
- "contact-filled": "\ue130",
- "person": "\ue101",
- "contact": "\ue100",
- "images-filled": "\ue87a",
- "phone": "\ue200",
- "images": "\ue87b",
- "image": "\ue363",
- "image-filled": "\ue877",
- "location-filled": "\ue333",
- "location": "\ue303",
- "plus-filled": "\ue439",
- "plus": "\ue409",
- "plusempty": "\ue468",
- "help-filled": "\ue535",
- "help": "\ue505",
- "navigate-filled": "\ue884",
- "navigate": "\ue501",
- "mic-slash-filled": "\ue892",
- "search": "\ue466",
- "settings": "\ue560",
- "sound": "\ue590",
- "sound-filled": "\ue8a1",
- "spinner-cycle": "\ue465",
- "download-filled": "\ue8a4",
- "personadd-filled": "\ue132",
- "videocam-filled": "\ue8af",
- "personadd": "\ue102",
- "upload": "\ue402",
- "upload-filled": "\ue8b1",
- "starhalf": "\ue463",
- "star-filled": "\ue438",
- "star": "\ue408",
- "trash": "\ue401",
- "phone-filled": "\ue230",
- "compose": "\ue400",
- "videocam": "\ue300",
- "trash-filled": "\ue8dc",
- "download": "\ue403",
- "chatbubble-filled": "\ue232",
- "chatbubble": "\ue202",
- "cloud-download": "\ue8e4",
- "cloud-upload-filled": "\ue8e5",
- "cloud-upload": "\ue8e6",
- "cloud-download-filled": "\ue8e9",
- "headphones":"\ue8bf",
- "shop":"\ue609"
-}
diff --git a/uni_modules/song-data-picker/components/uni-icons/uni-icons.vue b/uni_modules/song-data-picker/components/uni-icons/uni-icons.vue
deleted file mode 100644
index 5f303e4..0000000
--- a/uni_modules/song-data-picker/components/uni-icons/uni-icons.vue
+++ /dev/null
@@ -1,67 +0,0 @@
-
- {{icons[type]}}
-
-
-
-
-
diff --git a/uni_modules/song-data-picker/components/uni-icons/uni.ttf b/uni_modules/song-data-picker/components/uni-icons/uni.ttf
deleted file mode 100644
index 60a1968..0000000
Binary files a/uni_modules/song-data-picker/components/uni-icons/uni.ttf and /dev/null differ
diff --git a/uni_modules/song-data-picker/components/uni-list-item/uni-list-item.vue b/uni_modules/song-data-picker/components/uni-list-item/uni-list-item.vue
index 7688e64..c5e2797 100644
--- a/uni_modules/song-data-picker/components/uni-list-item/uni-list-item.vue
+++ b/uni_modules/song-data-picker/components/uni-list-item/uni-list-item.vue
@@ -39,7 +39,7 @@