xiaohaizhao 4 maanden geleden
bovenliggende
commit
a977db5302

+ 6 - 1
pages/generalServices/modules/handle.vue

@@ -188,10 +188,15 @@ function openAllotfunc(id, type) {
     ).then(res => {
         console.log("服务人员", res)
         if (res.code !== 1) return uni.showToast({ title: res.msg, icon: 'none' });
+        let userMsg = uni.getStorageSync('userMsg')
         users.value = [{
             name: "抢单中心",
             userid: null
-        }, uni.getStorageSync('userMsg')].concat(res.data);
+        }]
+        if (userMsg.usertype == 21) {
+            users.value.push(userMsg)
+        }
+        users.value = users.value.concat(res.data);
         allot.value = true;
     })
 }

+ 4 - 0
pages/launchApplication/index.vue

@@ -166,6 +166,10 @@ $Http.basic({
         if (res.data.agent.type == '网销') {
             form.isonlinesales = 1;
         }
+        // 在enterprise中取省市县
+        form.province = res.data.enterprise.province;
+        form.city = res.data.enterprise.city;
+        form.county = res.data.enterprise.county;
     }
 })
 

+ 4 - 4
pages/skus/index.vue

@@ -78,7 +78,7 @@ const content = reactive({
     "pageNumber": 1,
     "pageSize": 20,
     "where": {
-        isvoid: 0,
+        isinstalled: "未安装",
         "condition": ""
     }
 });
@@ -95,17 +95,17 @@ function onSearch(e) {
 let tabList = ref([
     {
         name: '未安装',
-        value: 0
+        value: '0'
     },
     {
         name: '已安装',
-        value: 1
+        value: '1'
     }
 ]),
     current = ref(0);
 
 function tabClick(e) {
-    content.where.isvoid = e.value;
+    content.where.isinstalled = e.name;
     getList(true);
     listBox.value.backToTop()
 }

+ 1 - 0
pages/workOrder/detail.vue

@@ -332,6 +332,7 @@ function takeOrders() {
         console.log("接单结果", res)
         if (res.code == 1) {
             takeOrderShow.value = false;
+            getDetail()
             uni.navigateTo({
                 url: `/pages/workOrder/changeMsg?id=` + detail.sa_workorderid,
                 success: () => {