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

src/view/tiip/kanban/operate.vue

@@ -54,7 +54,14 @@
                     <div @click="routerToOperateDetail(v)" style="text-decoration:underline;">{{v.sType}}</div>
                 </td>
                 <td>
-                    <div>{{Number(v.nQty||0).toLocaleString()}}</div>
+                    <div style="display:flex;flex-wrap:wrap">
+                        <span style="width:100%;">
+                            {{Number(v.M_nQty||0).toLocaleString()}}(M)
+                        </span>
+                        <span>
+                            {{Number(v.YD_nQty||0).toLocaleString()}}(YD)
+                        </span>
+                    </div>
                 </td>
                 <td>
                     <div>{{Number(v.nPieces||0).toLocaleString()}}</div>
@@ -99,7 +106,22 @@ export default {
                 params:{},
             },true,{})
             if(typeof value=='object'&&value.length>0){
-                this.list=value
+                let data = []
+                
+                value.map(x=>{
+                    let flag = false;
+                    data.map(y=>{
+                        if(x.sType == y.sType){
+                            y[`${x.sUnit}_nQty`] = x.nQty;
+                            flag = true;
+                        }
+                    })
+                    if(!flag){
+                        x[`${x.sUnit}_nQty`] = x.nQty;
+                        data.push(x);
+                    }
+                })
+                this.list=data
             }else{
                 this.list=[]
             }

src/view/tiip/kanban/operateCustomDetail.vue

@@ -119,7 +119,6 @@ export default {
                     field:this.hdr.sType == '供应商索赔' ? 'sPayableNO' : 'sReceivableNO',
                     underline:true,
                     color:'#2d8cf0',
-                    field:this.hdr.sType == '供应商索赔' ? params.row.sPayableNO : params.row.sReceivableNO,
                     render: (h,params) => {
                         return h('span',{
                             style: {
@@ -419,6 +418,7 @@ export default {
                 {key:"begin_date",value:this.hdr.begin_date},
                 {key:"end_date",value:this.hdr.end_date},
             ];
+            console.log(this.hdr.sType)
             if(this.type == 'custom'){
                 if(this.hdr.sType == '采购退货' || this.hdr.sType == '采购' || this.hdr.sType == '加工' || this.hdr.sType == '收货' || this.hdr.sType == '成品入库' || this.hdr.sType == '加工回修'){
                     postData.push({key:"upbProviderGUID",value:this.customerItem.upbProviderGUID});

src/view/tiip/orderDetails/index.vue

@@ -50,6 +50,8 @@
                                 color:#586e86;
                                 font-weight: bold;
                                 background: #eef4fe;
+                                word-wrap: break-word;
+                                display: inline-block;
                             }
                             >div{
                                 height:100%;

src/view/tiip/uploadImg/index.vue

@@ -169,6 +169,14 @@ export default {
                 })
                 return false;
             }
+            if (parseInt(file.files[0].size / 1024) > (1024 * 10)) {
+                that.$vux.confirm.show({
+                    title:"提示",
+                    content:`图片大小超过10M,请重新上传！`,
+                    showCancelButton:false,
+                })
+                return false;
+            }
             that.upload(reader.result);  //或者 e.target.result都是一样的，都是base64码
         }  
         reader.readAsDataURL(this.files[0]);