Merge branch 'master' of http://47.110.145.204:8085/godwithdh/wx_h5

src/view/tiip/checkProgress/process/list.vue

@@ -146,9 +146,9 @@ export default {
     }
   },
   async mounted(){
+    this.$store.dispatch('saveUserId',this.$route.params.userId);
     await this.getStatus();
     await this.getHdr();
-    this.$store.dispatch('saveUserId',this.$route.params.userId);
   },
   async activated(){
     window.d = this;
@@ -201,7 +201,7 @@ export default {
             }else if(key == 'dEndDate'){
                 postData.push({key:key,value:value + ' 23:59:59' || ''})
             }else if(key == 'searchvalue'){
-                postData.push({key:'searchname',value:value})
+                postData.push({key:'searchvalue',value:value})
             }
         }
         let res = await this.request('getTipProcessProgress',{

src/view/tiip/checkProgress/procurement/list.vue

@@ -140,9 +140,10 @@ export default {
     }
   },
   async mounted(){
+    this.$store.dispatch('saveUserId',this.$route.params.userId);
+
     await this.getStatus();
     await this.getHdr();
-    this.$store.dispatch('saveUserId',this.$route.params.userId);
   },
   async activated(){
     window.d = this;
@@ -195,7 +196,7 @@ export default {
             }else if(key == 'dEndDate'){
                 postData.push({key:'end_date',value:value + ' 23:59:59' || ''})
             }else if(key == 'searchvalue'){
-                postData.push({key:'searchname',value:value})
+                postData.push({key:'searchvalue',value:value})
             }
         }
         let res = await this.request('getTipProcurementProgress',{

src/view/tiip/kanban/abnormal.vue

@@ -21,10 +21,12 @@
                         border-left:2px solid #8D90FF;
                     }
                     &:nth-child(2n-1)>div{
-                        color:#68A0FE;
+                        // color:#68A0FE;
                     }
                     &:nth-child(2n){
+                        color:#68A0FE;
                         text-align: left;
+                        text-decoration: underline;
                     }
                 }
             }
@@ -35,30 +37,30 @@
     <div class="abnormal">
         <table cellspacing="0" >
             <tr>
-                <td style="width:100px;" @click="routerPushOperateDetail('销售退货')">
+                <td style="width:100px;" >
                     <div>销售退货</div>
                 </td>
-                <td>
+                <td @click="routerPushOperateDetail('销售退货')">
                     <div>{{Number(value['销售退货']||0).toLocaleString()}}</div>
                 </td>
-                <td style="width:100px;" @click="routerPushOperateDetail('采购退货')">
+                <td style="width:100px;">
                     <div>采购退货</div>
                 </td>
-                <td>
+                <td @click="routerPushOperateDetail('采购退货')">
                     <div>{{Number(value['采购退货']||0).toLocaleString()}}</div>
                 </td>
             </tr>
             <tr>
-                <td @click="routerPushOperateDetail('加工回修')">
+                <td >
                     <div>加工回修</div>
                 </td>
-                <td>
+                <td @click="routerPushOperateDetail('加工回修')">
                     <div>{{Number(value['加工回修']||0).toLocaleString()}}</div>
                 </td>
-                <td @click="routerPushOperateDetail('疵品汇总')">
+                <td>
                     <div>疵品数量</div>
                 </td>
-                <td>
+                <td @click="routerPushOperateDetail('疵品汇总')">
                     <div>{{Number(value['疵品汇总']||0).toLocaleString()}}</div>
                 </td>
             </tr>
@@ -69,41 +71,41 @@
                 <td>
                     <div>数量</div>
                 </td>
-                <td>
+                <td style="text-decoration:none;">
                     <div>{{Number(value['拖期订单总数量']||0).toLocaleString()}}</div>
                 </td>
                 <td>
                     <div>金额</div>
                 </td>
-                <td>
+                <td style="text-decoration:none;">
                     <div>{{Number(value['拖期订单总金额']||0).toLocaleString()}}</div>
                 </td>
             </tr>
             <tr>
-                <td  @click="routerPushOperateDetail('供应商索赔')">
+                <td>
                     <div>供应商赔款</div>
                 </td>
-                <td>
+                <td @click="routerPushOperateDetail('供应商索赔')">
                     <div>{{Number(value['供应商索赔']||0).toLocaleString()}}</div>
                 </td>
-                <td  @click="routerPushOperateDetail('客户索赔')">
+                <td>
                     <div>客户赔款</div>
                 </td>
-                <td>
+                <td @click="routerPushOperateDetail('客户索赔')">
                     <div>{{Number(value['客户索赔']||0).toLocaleString()}}</div>
                 </td>
             </tr>
             <tr>
-                <td @click="routerPushOperateDetail('超期应收')">
+                <td>
                     <div>超期应收额</div>
                 </td>
-                <td>
+                <td @click="routerPushOperateDetail('超期应收')">
                     <div>{{Number(value['超期应收']||0).toLocaleString()}}</div>
                 </td>
-                <td @click="routerPushOperateDetail('超期应付')">
+                <td>
                     <div>超期应付额</div>
                 </td>
-                <td>
+                <td @click="routerPushOperateDetail('超期应付')">
                     <div>{{Number(value['超期应付']||0).toLocaleString()}}</div>
                 </td>
             </tr>

src/view/tiip/kanban/operateCustomDetail.vue

@@ -339,7 +339,7 @@ export default {
                     {key:'url',value:this.hdr.sType == '采购' ? 'Procurement progress' : 'Processing schedule'},
                     {key:this.hdr.sType == '采购' ? 'begin_date' : 'dBeginDate',value:Util.dateFormat(this.list[res.trIndex].dContractDate,'yyyy-MM-dd')},
                     {key:this.hdr.sType == '采购' ? 'end_date' : 'dEndDate',value:Util.dateFormat(this.list[res.trIndex].dContractDate,'yyyy-MM-dd') + ' 23:59:59'},
-                    {key:'searchname',value:this.list[res.trIndex].sOrderNo},
+                    {key:this.hdr.sType == '采购' ? 'searchvalue' : 'searchname',value:this.list[res.trIndex].sOrderNo},
                     {key:'iContractType',value:this.list[res.trIndex].iContractType}
                 ]
                 let result = await this.request(this.hdr.sType == '采购' ? 'getTipProcurementProgress' : 'getTipProcessProgress',{ data:postData, params:{}},'加载中')