Merge branch 'spp' into 'master'

Spp

See merge request !36

src/api/apiList.js

@@ -10,8 +10,8 @@ const baseUrl = '/api'
 // todo: url
 // const httpUrl = 'https://repairtest.zeruiedu.com' // 测试接口
 const httpUrl = 'https://repair.zeruiedu.com' // 正式接口
-// const h5Url = 'http://localhost:8080' // 测试h5线上地址
-const h5Url = 'http://repair.h5.zeruiedu.com' // 测试h5线上地址
+const h5Url = 'http://localhost:8080' // 测试h5线上地址
+// const h5Url = 'http://repair.h5.zeruiedu.com' // 测试h5线上地址
 window.localStorage.setItem('httpUrl', httpUrl)
 window.localStorage.setItem('h5Url', h5Url)
 // const httpUrl = 'https://fenghexm.xueyoubangedu.com' // 正式接口

src/assets/styles/tabbar/admin_index.scss

@@ -355,7 +355,7 @@
 // 选择工人弹窗样式
 .tc-box{
     width: 6.9rem;
-    height: 90%;
+    height: 60%;
     background: #fff;
     padding-top: 0.3rem;
     padding-bottom: 0.3rem;
@@ -412,4 +412,24 @@
     color: #000000;
     font-size: 0.24rem;
     margin-right: 0.2rem;
+}
+
+
+.backBtn {
+    width: 0.8rem;
+    height: 0.8rem;
+    background: #fff;
+    box-shadow: 0 0 0.1rem #0054ff;
+    position: fixed;
+    right: 0.6rem;
+    top: 1rem;
+    z-index: 1;
+    border-radius: 50%;
+    padding: 0.1rem;
+}
+
+.backBtn img {
+    width: 100%;
+    height: 100%;
+    border-radius: 50%;
 }
\ No newline at end of file

src/router/index.js

@@ -114,11 +114,16 @@ router.beforeEach((to, from, next) => {
         next()
         return true
     }
-    if (to.query.token && to.query.status) {
+    if ((to.query.token || to.query.id) && to.query.status) {
         // console.log('ok-------0', status)
-        token = to.query.token
+        if (to.query.token) {
+            token = to.query.token
+        } else {
+            var tempToken = to.query.id.split('=')
+            console.log('tempToken', tempToken)
+            token = tempToken[1]
+        }
         status = to.query.status
-        console.log('1111', to)
         if (to.query.role != 0) {
             role = to.query.role
             window.localStorage.setItem('role', role)
@@ -131,14 +136,12 @@ router.beforeEach((to, from, next) => {
         window.localStorage.setItem('status', status)
     }
     if (token && status === '200') {
-        // const is_detail = to.query.is_info ? 1 : 0
-        // console.log('is_detail', is_detail)
         console.log('ok-------1', 200)
         if ((role == 2 || role == 4) && to.path =='/') { // 2审核员身份  4超管身份
             // setTimeout(() => {
-                next({
-                    path: '/admin_home'
-                })
+            next({
+                path: '/admin_home'
+            })
             // }, 50)
         }
         next()

src/views/my/order_detail.vue

@@ -95,6 +95,14 @@
           </div>
           <div class="item_line"></div>
         </div>
+        <div class="item flex-h flex-start" v-if="order.orderlog_transfer">
+          <div class="item-title">转单备注:</div>
+          <div class="item-desc">{{order.orderlog_transfer.remark}}</div>
+        </div>
+        <div class="item flex-h flex-start" v-if="order.orderlog_cancel">
+          <div class="item-title">退回备注:</div>
+          <div class="item-desc">{{order.orderlog_cancel.remark}}</div>
+        </div>
         <div class="btn flex-h flex-hr" v-if="btnShow">
           <div v-if="order.is_can_remark_material==1" class="btn-item bz-btn" @click="bz_click">备注耗材</div>
           <div
@@ -237,6 +245,15 @@ export default {
         this.getDetail()
     },
     methods: {
+      preview(img, index){
+				let temp = img.map(item=>{
+					return item.url
+				})
+				ImagePreview({
+					images: temp,
+					startPosition: index,
+				});
+			},
 			// 确认完成
         sure_click (item, index) {
             const vm = this
@@ -441,13 +458,13 @@ export default {
 <style lang="scss" scoped>
 @import "@assets/styles/tabbar/index.scss";
 .backBtn {
-  width: 1rem;
-  height: 1rem;
+  width: 0.8rem;
+  height: 0.8rem;
   background: #fff;
   box-shadow: 0 0 0.1rem #0054ff;
   position: fixed;
-  right: 0.3rem;
-  bottom: 1.3rem;
+  right: 0.6rem;
+  top: 1rem;
   z-index: 1;
   border-radius: 50%;
   padding: 0.1rem;

src/views/tabbar/admin_home.vue

@@ -56,11 +56,7 @@
             <div class="tc-box">
               <div class="tc-title">选择工人</div>
               <div class="workers">
-                <div
-                  class="gr-item"
-                  v-for="(child_item,child_index) in columns"
-                  :key="child_index"
-                >
+                <div class="gr-item" v-for="(child_item,child_index) in columns" :key="child_index">
                   <div class="bm-item">{{child_item.name}}</div>
                   <div
                     class="people-item flex-h flex-vc flex-hb"
@@ -130,7 +126,11 @@
           </div>
           <div class="material" v-if="item.no_pay_order">
             <div class="item-title bz-title">待支付耗材</div>
-            <div class="no-pay ma-item flex-h flex-hb" v-for="(child, index) in item.no_pay_order.goods" :key="index">
+            <div
+              class="no-pay ma-item flex-h flex-hb"
+              v-for="(child, index) in item.no_pay_order.goods"
+              :key="index"
+            >
               <div class="one one1 text-line-one">{{child.parent_detail.goods_name}}</div>
               <div class="one one2 flex-h">
                 <div class="_one text-line-one">{{child.good_detail.goods_name}}</div>
@@ -214,9 +214,7 @@
               <div class="wo flex-h flex-vc">
                 <div class="item-title" v-if="item.order_status_display == '已派工'">重新派工：</div>
                 <div class="item-title" v-else>派工对象：</div>
-                <div
-                  class="item-desc worker-name"
-                >{{item.workerName.length ? item.workerName.join(',') : ''}}</div>
+                <div class="item-desc worker-name">{{item.realName}}</div>
               </div>
               <div class="flex-h flex-vc">
                 <div class="select flex-h flex-vc">
@@ -365,13 +363,13 @@ export default {
       // 选择完工人点击确定按钮
       keyConfirm(i){
         if(!this.list[i].temporaryId.length){
-            this.$toast('请选择工人！')
+          this.$toast('请选择工人！')
             return
         }
         this.list[i].workerName = [...this.list[i].temporaryName]
+        this.list[i].realName = this.list[i].workerName.length ? this.list[i].workerName.join(',') : ''
         this.list[i].worker_id = [...this.list[i].temporaryId]
         this.list[i].showWorker = false
-
       },
       chooseWorker(item,lchild_index,index){
         if(this.list[index].temporaryId.includes(item.id)){ // 删除
@@ -381,7 +379,6 @@ export default {
         }else{ // 加入
            this.list[index].temporaryId.push(item.id)
            this.list[index].temporaryName.push(item.name)
-          // console.log('选中的',this.list[index].temporaryName);
         }
       },
       onmore(){
@@ -409,6 +406,7 @@ export default {
             // console.log('1111',item);
             this.curItem = item
             this.repair_order_id = item.id
+            console.log('工人id',item.worker_id);
             if(!item.worker_id.length) {
                 this.$toast('请选择工人')
                 return
@@ -420,7 +418,11 @@ export default {
             this.$http
                 .post(this.$myApi.REPAIR_ASSIGN, curParams)
                 .then((data) => {
-                      console.log('指派工人',data);
+                      data.workerName = []
+                      data.realName = ''
+                      data.temporaryName=[]
+                      data.temporaryId=[]
+                      data.worker_id = []
                     this.$toast('操作成功')
                     this.reason = ''
                   this.changeList(data,index)
@@ -576,6 +578,7 @@ export default {
                         this.list = this.list.map(item=>{
                           item.showWorker = false
                           item.workerName = []
+                          item.realName = ''
                           item.temporaryName=[]
                           item.temporaryId=[]
                           item.worker_id = []