开发

ghsApp/dist/build/mp-weixin/components/app-img.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

ghsApp/dist/build/mp-weixin/components/app-uploader.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

ghsApp/dist/build/mp-weixin/components/module/allSelectInput.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

ghsApp/dist/build/mp-weixin/components/module/app-vip.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

ghsApp/dist/build/mp-weixin/components/plugin/bottom-popup.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

ghsApp/dist/build/mp-weixin/pagesGys/common/vendor.js

@@ -1 +0,0 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pagesGys/common/vendor"],{"0dca":function(e,t,r){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.clearOrderApi=t.getOrderDebtListApi=t.getDebtListApi=void 0;var a=i(r("14bf"));function i(e){return e&&e.__esModule?e:{default:e}}var u=function(e){return a.default.get("/custom/debt-list",{name:e})};t.getDebtListApi=u;var n=function(e){return a.default.get("/purchase/debt-list",{id:e})};t.getOrderDebtListApi=n;var o=function(e){return a.default.post("/purchase-clear/create-order",e)};t.clearOrderApi=o}}]);

ghsApp/dist/build/mp-weixin/pagesGys/detailsItem.js

@@ -1,4 +1,4 @@
-require('common/vendor.js');(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pagesGys/detailsItem"],{"22fa":function(t,n,e){},"594f":function(t,n,e){"use strict";e.r(n);var i=e("ad98"),a=e.n(i);for(var u in i)["default"].indexOf(u)<0&&function(t){e.d(n,t,(function(){return i[t]}))}(u);n["default"]=a.a},"6bc3":function(t,n,e){"use strict";e.r(n);var i=e("c537"),a=e("594f");for(var u in a)["default"].indexOf(u)<0&&function(t){e.d(n,t,(function(){return a[t]}))}(u);e("a34b");var c,f=e("0095"),r=Object(f["a"])(a["default"],i["b"],i["c"],!1,null,"65438275",null,!1,i["a"],c);n["default"]=r.exports},a34b:function(t,n,e){"use strict";var i=e("22fa"),a=e.n(i);a.a},ad98:function(t,n,e){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var i={props:{info:{required:!0},isEdit:{type:Boolean,default:!1},isCheck:{type:Boolean,default:!1}},methods:{checkEvent:function(){this.isEdit&&this.$emit("click",this.info)}}};n.default=i},c537:function(t,n,e){"use strict";var i;e.d(n,"b",(function(){return a})),e.d(n,"c",(function(){return u})),e.d(n,"a",(function(){return i}));var a=function(){var t=this,n=t.$createElement;t._self._c},u=[]}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pagesGys/detailsItem"],{"0070":function(t,e,n){"use strict";var i;n.d(e,"b",(function(){return u})),n.d(e,"c",(function(){return r})),n.d(e,"a",(function(){return i}));var u=function(){var t=this,e=t.$createElement;t._self._c},r=[]},"594f":function(t,e,n){"use strict";n.r(e);var i=n("ad98"),u=n.n(i);for(var r in i)["default"].indexOf(r)<0&&function(t){n.d(e,t,(function(){return i[t]}))}(r);e["default"]=u.a},"6bc3":function(t,e,n){"use strict";n.r(e);var i=n("0070"),u=n("594f");for(var r in u)["default"].indexOf(r)<0&&function(t){n.d(e,t,(function(){return u[t]}))}(r);n("eb09");var a,o=n("0095"),c=Object(o["a"])(u["default"],i["b"],i["c"],!1,null,"3fc08594",null,!1,i["a"],a);e["default"]=c.exports},9457:function(t,e,n){},ad98:function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var i={props:{info:{required:!0},isEdit:{type:Boolean,default:!1},isCheck:{type:Boolean,default:!1}},methods:{goToDetai:function(t){this.$util.pageTo({url:"/pagesPurchase/info",query:{orderSn:t.orderSn}})},checkEvent:function(){this.isEdit&&this.$emit("click",this.info)}}};e.default=i},eb09:function(t,e,n){"use strict";var i=n("9457"),u=n.n(i);u.a}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pagesGys/detailsItem-create-component',
     {

ghsApp/dist/build/mp-weixin/pagesGys/detailsItem.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

ghsApp/dist/build/mp-weixin/pagesGys/detailsItem.wxml

@@ -1 +1 @@
-<view data-event-opts="{{[['tap',[['checkEvent',['$event']]]]]}}" class="details-item data-v-65438275" catchtap="__e"><block wx:if="{{isEdit}}"><view class="details-select data-v-65438275"><block wx:if="{{isCheck}}"><text class="iconfont iconxuanzhong data-v-65438275"></text></block><block wx:else><text class="iconfont iconweixuanzhong data-v-65438275"></text></block></view></block><view class="details-main data-v-65438275"><view class="item-header data-v-65438275"><text class="name data-v-65438275">{{"采购单 | "+info.orderSn+''}}</text></view><view class="item-row data-v-65438275"><view class="mark data-v-65438275">{{info.addTime}}</view></view><view class="item-row data-v-65438275"><view class="mark data-v-65438275">{{"金额："+info.realPrice}}</view><view class="price data-v-65438275">{{info.realPrice}}</view></view></view></view>
+<view data-event-opts="{{[['tap',[['checkEvent',['$event']]]]]}}" class="details-item data-v-3fc08594" catchtap="__e"><block wx:if="{{isEdit}}"><view class="details-select data-v-3fc08594"><block wx:if="{{isCheck}}"><text class="iconfont iconxuanzhong data-v-3fc08594"></text></block><block wx:else><text class="iconfont iconweixuanzhong data-v-3fc08594"></text></block></view></block><view class="details-main data-v-3fc08594"><view class="item-header data-v-3fc08594"><text class="name data-v-3fc08594">{{"采购单 | "+info.orderSn+''}}</text></view><view class="item-row data-v-3fc08594"><view class="mark data-v-3fc08594">{{info.addTime}}</view></view><view class="item-row data-v-3fc08594"><view class="price data-v-3fc08594">{{"金额："+info.realPrice}}</view><view data-event-opts="{{[['tap',[['goToDetai',['$0'],['info']]]]]}}" class="price data-v-3fc08594" style="font-weight:normal;color:#3385FF;font-size:30rpx;" catchtap="__e">查看明细</view></view></view></view>

ghsApp/dist/build/mp-weixin/pagesGys/detailsItem.wxss

@@ -1 +1 @@
-.details-item.data-v-65438275{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;padding:30rpx 20rpx;margin-bottom:20rpx;background-color:#fff;border-radius:10rpx}.details-item .details-select.data-v-65438275{margin-right:30rpx}.details-item .details-select .iconfont.data-v-65438275{font-size:40rpx;color:#ddd}.details-item .details-select .iconxuanzhong.data-v-65438275{color:#3385ff}.details-item .details-main.data-v-65438275{-webkit-box-flex:1;-webkit-flex:1;flex:1}.details-item .item-header.data-v-65438275{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.details-item .item-header .logo.data-v-65438275{margin-right:20rpx;width:50rpx;height:50rpx;border-radius:50%}.details-item .item-header .name.data-v-65438275{font-size:28rpx;font-family:PingFang SC;font-weight:600;color:#333}.details-item .item-row.data-v-65438275{margin-top:20rpx;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between}.details-item .item-row .mark.data-v-65438275{font-size:28rpx;font-weight:400;color:#666}.details-item .item-row .price.data-v-65438275{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;font-size:28rpx;font-weight:600;color:#333}.details-item .item-row .price .iconfont.data-v-65438275{font-size:28rpx;color:#999}
+.details-item.data-v-3fc08594{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;padding:30rpx 20rpx;margin-bottom:20rpx;background-color:#fff;border-radius:10rpx}.details-item .details-select.data-v-3fc08594{margin-right:30rpx}.details-item .details-select .iconfont.data-v-3fc08594{font-size:40rpx;color:#ddd}.details-item .details-select .iconxuanzhong.data-v-3fc08594{color:#3385ff}.details-item .details-main.data-v-3fc08594{-webkit-box-flex:1;-webkit-flex:1;flex:1}.details-item .item-header.data-v-3fc08594{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.details-item .item-header .logo.data-v-3fc08594{margin-right:20rpx;width:50rpx;height:50rpx;border-radius:50%}.details-item .item-header .name.data-v-3fc08594{font-size:28rpx;font-family:PingFang SC;font-weight:600;color:#333}.details-item .item-row.data-v-3fc08594{margin-top:20rpx;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between}.details-item .item-row .mark.data-v-3fc08594{font-size:28rpx;font-weight:400;color:#666}.details-item .item-row .price.data-v-3fc08594{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;font-size:28rpx;font-weight:600;color:#333}.details-item .item-row .price .iconfont.data-v-3fc08594{font-size:28rpx;color:#999}

ghsApp/dist/build/mp-weixin/pagesOrder/components/stepShip.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

ghsApp/dist/build/mp-weixin/pagesPurchase/orderItem.js

@@ -1,4 +1,4 @@
-require('common/vendor.js');(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pagesPurchase/orderItem"],{"047a8":function(t,e,n){"use strict";var a;n.d(e,"b",(function(){return r})),n.d(e,"c",(function(){return u})),n.d(e,"a",(function(){return a}));var r=function(){var t=this,e=t.$createElement;t._self._c},u=[]},"19e3":function(t,e,n){"use strict";n.r(e);var a=n("a3d5"),r=n.n(a);for(var u in a)["default"].indexOf(u)<0&&function(t){n.d(e,t,(function(){return a[t]}))}(u);e["default"]=r.a},"44b6":function(t,e,n){},7449:function(t,e,n){"use strict";var a=n("44b6"),r=n.n(a);r.a},"8ab3":function(t,e,n){"use strict";n.r(e);var a=n("047a8"),r=n("19e3");for(var u in r)["default"].indexOf(u)<0&&function(t){n.d(e,t,(function(){return r[t]}))}(u);n("7449");var c,i=n("0095"),f=Object(i["a"])(r["default"],a["b"],a["c"],!1,null,"e67328fa",null,!1,a["a"],c);e["default"]=f.exports},a3d5:function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var a=n("7602"),r={props:{info:{required:!0}},data:function(){return{PURCHASE_ORDER_STATUS:a.PURCHASE_ORDER_STATUS}},computed:{getStatusName:function(){var t="";switch(this.info.status){case a.PURCHASE_ORDER_STATUS.CONFIRM:t="待确认";break;case a.PURCHASE_ORDER_STATUS.UNDIS:t="待配送";break;case a.PURCHASE_ORDER_STATUS.DIS:t="配送中";break;case a.PURCHASE_ORDER_STATUS.DONE:t="已完成";break;default:break}return t}},methods:{clickItemEvent:function(){this.$emit("click",this.info)}}};e.default=r}}]);
+require('common/vendor.js');(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pagesPurchase/orderItem"],{"19e3":function(t,e,n){"use strict";n.r(e);var a=n("a3d5"),r=n.n(a);for(var u in a)["default"].indexOf(u)<0&&function(t){n.d(e,t,(function(){return a[t]}))}(u);e["default"]=r.a},"8ab3":function(t,e,n){"use strict";n.r(e);var a=n("fa5b"),r=n("19e3");for(var u in r)["default"].indexOf(u)<0&&function(t){n.d(e,t,(function(){return r[t]}))}(u);n("f5cf");var c,f=n("0095"),i=Object(f["a"])(r["default"],a["b"],a["c"],!1,null,"61cf5d97",null,!1,a["a"],c);e["default"]=i.exports},9339:function(t,e,n){},a3d5:function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var a=n("7602"),r={props:{info:{required:!0}},data:function(){return{PURCHASE_ORDER_STATUS:a.PURCHASE_ORDER_STATUS}},computed:{getStatusName:function(){var t="";switch(this.info.status){case a.PURCHASE_ORDER_STATUS.CONFIRM:t="待确认";break;case a.PURCHASE_ORDER_STATUS.UNDIS:t="待配送";break;case a.PURCHASE_ORDER_STATUS.DIS:t="配送中";break;case a.PURCHASE_ORDER_STATUS.DONE:t="已完成";break;default:break}return t}},methods:{clickItemEvent:function(){this.$emit("click",this.info)}}};e.default=r},f5cf:function(t,e,n){"use strict";var a=n("9339"),r=n.n(a);r.a},fa5b:function(t,e,n){"use strict";var a;n.d(e,"b",(function(){return r})),n.d(e,"c",(function(){return u})),n.d(e,"a",(function(){return a}));var r=function(){var t=this,e=t.$createElement;t._self._c},u=[]}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pagesPurchase/orderItem-create-component',
     {

ghsApp/dist/build/mp-weixin/pagesPurchase/orderItem.wxml

@@ -1 +1 @@
-<view data-event-opts="{{[['tap',[['clickItemEvent',['$event']]]]]}}" class="order-item-view data-v-e67328fa" bindtap="__e"><view class="item-header data-v-e67328fa"><view class="title data-v-e67328fa"><image class="icon data-v-e67328fa" src="{{info.supplierAvatar}}" alt></image><text class="name data-v-e67328fa">{{''+info.supplierName+''}}</text></view><view class="status data-v-e67328fa">{{getStatusName+''}}</view></view><view class="item-main data-v-e67328fa"><view class="item-info data-v-e67328fa"><view class="info-row data-v-e67328fa"><text class="info-label data-v-e67328fa">日期：</text><text class="info-value data-v-e67328fa">{{info.addTime+''}}</text></view><view class="info-row data-v-e67328fa"><text class="info-label data-v-e67328fa">单号：</text><text class="info-value data-v-e67328fa">{{info.orderSn+''}}</text></view><view class="info-row data-v-e67328fa"><text class="info-label data-v-e67328fa">人员：</text><text class="info-value data-v-e67328fa">{{info.adminName+''}}</text></view><view class="info-row data-v-e67328fa"><text class="info-label data-v-e67328fa">备注：</text><text class="info-value data-v-e67328fa" style="overflow:hidden;text-overflow:ellipsis;white-space:nowrap;width:450rpx;">{{info.remark+''}}</text></view></view><view class="item-price data-v-e67328fa">{{"¥"+info.realPrice+''}}<text class="iconfont iconxiangyou data-v-e67328fa"></text></view></view></view>
+<view data-event-opts="{{[['tap',[['clickItemEvent',['$event']]]]]}}" class="order-item-view data-v-61cf5d97" bindtap="__e"><view class="item-header data-v-61cf5d97"><view class="title data-v-61cf5d97"><image class="icon data-v-61cf5d97" src="{{info.supplierAvatar}}" alt></image><text class="name data-v-61cf5d97">{{''+info.supplierName+''}}</text></view><block wx:if="{{info.refund==2}}"><view class="status data-v-61cf5d97" style="color:red;border:1px solid red;border-radius:20rpx;font-size:20rpx;padding:5rpx 12rpx;margin-right:50rpx;">有退款</view></block><block wx:if="{{info.debt==1}}"><view class="status data-v-61cf5d97" style="color:red;border:1px solid red;border-radius:20rpx;font-size:20rpx;padding:5rpx 12rpx;margin-right:50rpx;">欠款</view></block><view class="status data-v-61cf5d97">{{getStatusName+''}}</view></view><view class="item-main data-v-61cf5d97"><view class="item-info data-v-61cf5d97"><view class="info-row data-v-61cf5d97"><text class="info-label data-v-61cf5d97">日期：</text><text class="info-value data-v-61cf5d97">{{info.addTime+''}}</text></view><view class="info-row data-v-61cf5d97"><text class="info-label data-v-61cf5d97">单号：</text><text class="info-value data-v-61cf5d97">{{info.orderSn+''}}</text></view><view class="info-row data-v-61cf5d97"><text class="info-label data-v-61cf5d97">人员：</text><text class="info-value data-v-61cf5d97" style="overflow:hidden;text-overflow:ellipsis;white-space:nowrap;width:300rpx;">{{info.adminName+''}}</text></view><view class="info-row data-v-61cf5d97"><text class="info-label data-v-61cf5d97">备注：</text><text class="info-value data-v-61cf5d97" style="overflow:hidden;text-overflow:ellipsis;white-space:nowrap;width:450rpx;">{{info.remark+''}}</text></view></view><view class="item-price data-v-61cf5d97">{{"¥"+info.realPrice+''}}<text class="iconfont iconxiangyou data-v-61cf5d97"></text></view></view></view>

ghsApp/dist/build/mp-weixin/pagesPurchase/orderItem.wxss

@@ -1 +1 @@
-.order-item-view.data-v-e67328fa{padding:30rpx;margin-bottom:20rpx;width:100%;background-color:#fff}.order-item-view .item-header.data-v-e67328fa{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between;-webkit-box-align:center;-webkit-align-items:center;align-items:center;margin-bottom:20rpx}.order-item-view .item-header .title.data-v-e67328fa{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-flex:1;-webkit-flex:1;flex:1}.order-item-view .item-header .title .icon.data-v-e67328fa{margin-right:20rpx;width:50rpx;height:50rpx;border-radius:25rpx;border-radius:50%}.order-item-view .item-header .title .name.data-v-e67328fa{font-size:32rpx;font-weight:600;color:#333}.order-item-view .item-header .status.data-v-e67328fa{-webkit-flex-shrink:0;flex-shrink:0;color:#3385ff}.order-item-view .item-main.data-v-e67328fa{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:end;-webkit-align-items:flex-end;align-items:flex-end}.order-item-view .item-main .item-info.data-v-e67328fa{-webkit-box-flex:1;-webkit-flex:1;flex:1;font-size:26rpx}.order-item-view .item-main .item-info .info-row.data-v-e67328fa{margin-top:12rpx;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.order-item-view .item-main .item-info .info-label.data-v-e67328fa{font-weight:400;color:#999}.order-item-view .item-main .item-info .info-value.data-v-e67328fa{font-weight:400;color:#333}.order-item-view .item-main .item-price.data-v-e67328fa{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-flex-shrink:0;flex-shrink:0;font-size:30rpx;font-weight:600;color:#333}.order-item-view .item-main .item-price .iconfont.data-v-e67328fa{font-size:28rpx;color:#999}
+.order-item-view.data-v-61cf5d97{padding:30rpx;margin-bottom:20rpx;width:100%;background-color:#fff}.order-item-view .item-header.data-v-61cf5d97{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between;-webkit-box-align:center;-webkit-align-items:center;align-items:center;margin-bottom:20rpx}.order-item-view .item-header .title.data-v-61cf5d97{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-flex:1;-webkit-flex:1;flex:1}.order-item-view .item-header .title .icon.data-v-61cf5d97{margin-right:20rpx;width:50rpx;height:50rpx;border-radius:25rpx;border-radius:50%}.order-item-view .item-header .title .name.data-v-61cf5d97{font-size:32rpx;font-weight:600;color:#333}.order-item-view .item-header .status.data-v-61cf5d97{-webkit-flex-shrink:0;flex-shrink:0;color:#3385ff}.order-item-view .item-main.data-v-61cf5d97{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:end;-webkit-align-items:flex-end;align-items:flex-end}.order-item-view .item-main .item-info.data-v-61cf5d97{-webkit-box-flex:1;-webkit-flex:1;flex:1;font-size:26rpx}.order-item-view .item-main .item-info .info-row.data-v-61cf5d97{margin-top:12rpx;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.order-item-view .item-main .item-info .info-label.data-v-61cf5d97{font-weight:400;color:#999}.order-item-view .item-main .item-info .info-value.data-v-61cf5d97{font-weight:400;color:#333}.order-item-view .item-main .item-price.data-v-61cf5d97{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-flex-shrink:0;flex-shrink:0;font-size:30rpx;font-weight:600;color:#333}.order-item-view .item-main .item-price .iconfont.data-v-61cf5d97{font-size:28rpx;color:#999}

ghsApp/dist/build/mp-weixin/pagesPurchase/supplier.wxml

@@ -1 +1 @@
-<view class="order-page data-v-7a52611d"><scroll-view class="order_list data-v-7a52611d" scroll-y="{{true}}" scroll-view="{{true}}"><block class="data-v-7a52611d"><block wx:if="{{!$root.g0}}"><block class="data-v-7a52611d"><block wx:for="{{$root.l0}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['gotoDetails',['$event']]]]]}}" class="list_item data-v-7a52611d" bindtap="__e"><image src="{{item.$orig.avatar}}" class="data-v-7a52611d"></image><view class="store_name data-v-7a52611d"><view class="store_title data-v-7a52611d">{{item.$orig.name}}</view><view class="accumulative data-v-7a52611d">{{"欠款: "+item.$orig.debtAmount}}</view></view><view class="store_btn data-v-7a52611d"><view data-event-opts="{{[['tap',[['gotoDetails',['$0'],[[['supplierList','',index]]]]]]]}}" class="btn_entrance data-v-7a52611d" catchtap="__e">采购</view><block wx:if="{{item.m0>0}}"><view data-event-opts="{{[['tap',[['gotoDetailsEvent',['$0'],[[['supplierList','',index]]]]]]]}}" class="btn_entrance data-v-7a52611d" catchtap="__e">结账</view></block><block wx:else><view data-event-opts="{{[['tap',[['',['$event']]]]]}}" class="btn_entrance btn_forbid data-v-7a52611d" catchtap="__e">结账</view></block><view data-event-opts="{{[['tap',[['pageTo',[['o',['url','/admin/clear/list'],['query',{ghsId:item.$orig.id}]]]]]]]}}" class="btn_entrance data-v-7a52611d" catchtap="__e">账单</view></view></view></block></block></block><block wx:else><block class="data-v-7a52611d"><app-wrapper-empty vue-id="6b4875c2-1" title="暂无数据" is-empty="{{$root.g1}}" class="data-v-7a52611d" bind:__l="__l"></app-wrapper-empty></block></block></block></scroll-view><view class="app-footer _div data-v-7a52611d"><view data-event-opts="{{[['tap',[['add',['$event']]]]]}}" class="admin-button-com middle blue _div data-v-7a52611d" bindtap="__e">添加</view></view></view>
+<view class="order-page data-v-3c337b84"><scroll-view class="order_list data-v-3c337b84" scroll-y="{{true}}" scroll-view="{{true}}"><block class="data-v-3c337b84"><block wx:if="{{!$root.g0}}"><block class="data-v-3c337b84"><block wx:for="{{$root.l0}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['gotoDetails',['$event']]]]]}}" class="list_item data-v-3c337b84" bindtap="__e"><image src="{{item.$orig.avatar}}" class="data-v-3c337b84"></image><view class="store_name data-v-3c337b84"><view class="store_title data-v-3c337b84">{{item.$orig.name}}</view><view class="accumulative data-v-3c337b84"></view></view><view class="store_btn data-v-3c337b84"><view data-event-opts="{{[['tap',[['gotoDetails',['$0'],[[['supplierList','',index]]]]]]]}}" class="btn_entrance data-v-3c337b84" catchtap="__e">采购</view><block wx:if="{{item.m0>0}}"><view data-event-opts="{{[['tap',[['gotoDetailsEvent',['$0'],[[['supplierList','',index]]]]]]]}}" class="btn_entrance data-v-3c337b84" catchtap="__e">欠款单</view></block><block wx:else><view data-event-opts="{{[['tap',[['',['$event']]]]]}}" class="btn_entrance btn_forbid data-v-3c337b84" catchtap="__e">结账单</view></block><view data-event-opts="{{[['tap',[['pageTo',[['o',['url','/admin/clear/list'],['query',{ghsId:item.$orig.id}]]]]]]]}}" class="btn_entrance data-v-3c337b84" catchtap="__e">账单</view></view></view></block></block></block><block wx:else><block class="data-v-3c337b84"><app-wrapper-empty vue-id="6b4875c2-1" title="暂无数据" is-empty="{{$root.g1}}" class="data-v-3c337b84" bind:__l="__l"></app-wrapper-empty></block></block></block></scroll-view><view class="app-footer _div data-v-3c337b84"><view data-event-opts="{{[['tap',[['add',['$event']]]]]}}" class="admin-button-com middle blue _div data-v-3c337b84" bindtap="__e">添加供应商</view></view></view>

ghsApp/dist/build/mp-weixin/pagesPurchase/supplier.wxss

@@ -1 +1 @@
-.order-page .order_list.data-v-7a52611d{height:100%;background:#f0f2f6;padding:0 0 120rpx}.order-page .order_list .list_item.data-v-7a52611d{margin:20rpx 0 0;position:relative;height:180rpx;width:100vw;background:#fff;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.order-page .order_list .list_item > image.data-v-7a52611d{margin-left:30rpx;width:120rpx;height:120rpx;border-radius:60rpx}.order-page .order_list .list_item > .store_name.data-v-7a52611d{margin-left:30rpx;width:280rpx;display:block}.order-page .order_list .list_item > .store_name > .store_title.data-v-7a52611d{margin-bottom:30rpx;width:200rpx;white-space:nowrap;text-overflow:ellipsis;overflow:hidden;word-break:break-all;font-size:32rpx;font-weight:700;color:#333}.order-page .order_list .list_item > .store_name > .accumulative.data-v-7a52611d{font-size:26rpx;color:#999}.order-page .order_list .list_item > .store_btn.data-v-7a52611d{position:absolute;right:20rpx}.order-page .order_list .list_item > .store_btn > .btn_entrance.data-v-7a52611d{display:inline-block;font-size:28rpx;color:#3385ff;border:1rpx solid #3385ff;border-radius:28rpx;padding:10rpx 20rpx;margin-left:20rpx}.order-page .order_list .list_item > .store_btn > .btn_forbid.data-v-7a52611d{border:1rpx solid #999;color:#999}.order-page .pay_list.data-v-7a52611d{padding-top:20rpx;background-color:#f0f2f6}.order-page .app-footer.data-v-7a52611d{-webkit-box-pack:end;-webkit-justify-content:flex-end;justify-content:flex-end}.order-page .app-footer .admin-button-com.data-v-7a52611d{width:180rpx;margin-right:30rpx}
+.order-page .tabs.data-v-3c337b84{height:80rpx;line-height:80rpx}.order-page .tabs > view.data-v-3c337b84{width:50%;text-align:center;font-size:28rpx;color:#666;display:inline-block}.order-page .tabs > .active.data-v-3c337b84{position:relative;color:#3385ff;font-weight:700}.order-page .tabs > .active.data-v-3c337b84::after{content:"";position:absolute;bottom:0;left:50%;-webkit-transform:translateX(-50%);transform:translateX(-50%);width:70rpx;height:6rpx;background:#3385ff}.order-page .order_list.data-v-3c337b84{height:100%;background:#f0f2f6;padding:0 0 20rpx}.order-page .order_list .list_item.data-v-3c337b84{margin:20rpx 0 0;position:relative;height:180rpx;width:100vw;background:#fff;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.order-page .order_list .list_item > image.data-v-3c337b84{margin-left:30rpx;width:120rpx;height:120rpx;border-radius:60rpx}.order-page .order_list .list_item > .store_name.data-v-3c337b84{margin-left:30rpx;width:280rpx;display:block}.order-page .order_list .list_item > .store_name > .store_title.data-v-3c337b84{margin-bottom:58rpx;width:500rpx;white-space:nowrap;text-overflow:ellipsis;overflow:hidden;word-break:break-all;font-size:35rpx;font-weight:700;color:#333}.order-page .order_list .list_item > .store_name > .accumulative.data-v-3c337b84{font-size:26rpx;color:#999}.order-page .order_list .list_item > .store_btn.data-v-3c337b84{position:absolute;top:100rpx;left:135rpx}.order-page .order_list .list_item > .store_btn > .btn_entrance.data-v-3c337b84{display:inline-block;font-size:28rpx;color:#3385ff;border:1rpx solid #3385ff;border-radius:10rpx;padding:10rpx 35rpx;margin-left:45rpx}.order-page .order_list .list_item > .store_btn > .btn_forbid.data-v-3c337b84{border:1rpx solid #999;color:#999}.order-page .pay_list.data-v-3c337b84{padding-top:20rpx;background-color:#f0f2f6}

ghsApp/src/pagesArrears/details.vue

@@ -273,8 +273,8 @@ export default {
 				align-items: center;
 				.logo {
 					margin-right: 10upx;
-					width: 35upx;
-					height: 35upx;
+					width: 32upx;
+					height: 32upx;
 					border-radius: 50%;
 				}
 				.name {

ghsApp/src/pagesGys/details.vue

@@ -1,20 +1,14 @@
 <template>
 	<view class="order-page">
 		<view class="top-view">
-			<view class="top-row">
-				<text class="header-item">供应商</text>
-				<text class="header-item">总欠款 </text>
-			</view>
 			<view class="top-row">
 				<view class="info-item">
+					<text class="name">供应商：</text>
 					<image class="logo" :src="ghsInfo.avatar"/>
 					<text class="name">
-						{{ ghsInfo.name || "" }}
+						{{ ghsInfo.name}}
 					</text>
 				</view>
-				<view class="price-item">
-					{{ ghsInfo.debtAmount || "0.00" }}
-				</view>
 			</view>
 		</view>
 		<view scroll-y class="shop-list">
@@ -264,8 +258,8 @@ export default {
 				align-items: center;
 				.logo {
 					margin-right: 10upx;
-					width: 50upx;
-					height: 50upx;
+					width: 32upx;
+					height: 32upx;
 					border-radius: 50%;
 				}
 				.name {

ghsApp/src/pagesGys/detailsItem.vue

@@ -12,8 +12,8 @@
 				<view class="mark">{{ info.addTime }}</view>
 			</view>
 			<view class="item-row">
-				<view class="mark">金额：{{ info.realPrice }}</view>
-				<view class="price">{{ info.realPrice }}</view>
+				<view class="price">金额：{{ info.realPrice }}</view>
+				<view class="price" style="font-weight:normal;color:#3385FF;font-size:30rpx;" @click.stop="goToDetai(info)">查看明细</view>
 			</view>
 		</view>
 	</view>
@@ -34,6 +34,12 @@ export default {
 		}
 	},
 	methods: {
+		goToDetai(item){
+			this.$util.pageTo({
+				url: "/pagesPurchase/info",
+				query: {orderSn:item.orderSn}
+			});
+		},
 		checkEvent() {
 			if (this.isEdit) {
 				this.$emit("click", this.info);

ghsApp/src/pagesPurchase/info.vue

@@ -59,6 +59,26 @@
 						 }}</view>
 				</view>
 			</view>
+
+			<view class="bills-info_box content-box" style="margin-top:18rpx;">
+				<view class="order-info_box" v-if="detailInfo.debt == 1">
+				<view>结算状态：</view>
+					<view style="color:red;">欠款</view>
+					<view class="price">
+					<text v-if="detailInfo.debtAmount > 0" @click="goToClear(detailInfo)" style="margin-right:38rpx;color:#3385FF;font-size:26rpx;">全部欠款</text>
+					<button @click="clearOrder(detailInfo)" class="admin-button-com">结帐</button>
+					</view>
+				</view>
+				<view class="order-info_box" v-else>
+				<view>结算状态：</view>
+					<view v-if="detailInfo.clearId > 0">已结清</view>
+					<view class="price" v-if="detailInfo.clearId > 0">
+					<button @click="pageTo({url: '/admin/clear/info',query: {id: detailInfo.clearId}})" class="admin-button-com">查看帐单</button>
+					</view>
+					<view v-if="detailInfo.clearId == 0">--</view>          
+				</view>
+			</view>
+
 			<view class="title">
 				商品信息
 			</view>
@@ -187,6 +207,7 @@
 
 import { getPurchaseDetailApi,updateRemark } from "@/api/purchase/index";
 import productMins from "@/mixins/product";
+import { clearOrderApi } from "@/api/gys/index";
 import TuiListCell from "@/components/plugin/list-cell";
 
 export default {
@@ -211,6 +232,43 @@ export default {
 
 	},
 	methods: {
+		//咨询是否结帐
+		clearOrder(item){
+			let self = this
+			uni.showModal({
+				title: '提示',
+				content: '确定结帐？',
+				success: function (res) {
+					if (res.confirm) {
+						self.doClearOrder(item)
+					}
+				}
+			});
+		},
+		//结帐
+		doClearOrder(item) {
+			let that = this
+			let id = item.id
+			let ghsId = item.ghsId
+			let actPrice = item.actPrice
+			let paramData = {
+				id:JSON.stringify([{id:id}]),
+				ghsId:ghsId,
+				modifyPrice:actPrice
+			}
+			clearOrderApi(paramData).then(res => {
+				if(res.code == 1) {
+					that.pageTo({url: '/common/pageSuccess?title=结帐成功',type: 2})
+				}
+			}).catch(err => {
+				console.log('err', err)
+			})
+		},
+		goToClear (item) {
+			this.pageTo({
+				url: '/pagesGys/details?id='+item.ghsId
+			})
+		},
 		modifyRemark(){
 			const self = this;
 			let remark = this.detailInfo.remark

ghsApp/src/pagesPurchase/orderItem.vue

@@ -7,6 +7,8 @@
 					{{ info.supplierName }}
 				</text>
 			</view>
+			<view v-if="info.refund == 2" class="status" style="color:red;border:1px solid red;border-radius:20rpx;font-size:20rpx;padding:5rpx 12rpx;margin-right:50rpx;">有退款 </view>
+			<view v-if="info.debt == 1" class="status" style="color:red;border:1px solid red;border-radius:20rpx;font-size:20rpx;padding:5rpx 12rpx;margin-right:50rpx;">欠款 </view>
 			<view class="status">{{ getStatusName }} </view>
 		</view>
 		<view class="item-main" >

ghsApp/src/pagesPurchase/supplier.vue

@@ -17,17 +17,17 @@
             <image :src="item.avatar"></image>
             <view class="store_name">
               <view class="store_title">{{item.name}}</view>
-              <view class="accumulative">欠款: {{item.debtAmount}}</view>
+              <view class="accumulative"></view>
             </view>
             <view class="store_btn">
               <view class="btn_entrance" @click.stop="gotoDetails(item)" >
                 采购
               </view>
               <view class="btn_entrance" v-if="Number(item.debtAmount) > 0" @click.stop="gotoDetailsEvent(item)" >
-                结账
+                欠款单
               </view>
               <view class="btn_entrance btn_forbid" v-else @click.stop="" >
-                结账
+                结账单
               </view>
               <view class="btn_entrance" @click.stop="pageTo({ url: '/admin/clear/list',query: {ghsId: item.id}})">
                 账单
@@ -45,7 +45,7 @@
     </scroll-view>
     <!-- 按钮 -->
 			<div class="app-footer">
-				<div class="admin-button-com middle blue" @click="add">添加</div>
+				<div class="admin-button-com middle blue" @click="add">添加供应商</div>
 			</div>
   </view>
 </template>
@@ -111,11 +111,38 @@ export default {
 
 <style lang="scss" scoped>
 .order-page {
+  .tabs {
+    height: 80upx;
+    line-height: 80upx;
+    & > view {
+      // padding: 0 80upx;
+      width: 50%;
+      text-align: center;
+      font-size: 28upx;
+      color: #666;
+      display: inline-block;
+    }
+    & > .active {
+      position: relative;
+      color: #3385ff;
+      font-weight: 700;
+    }
+    & > .active::after {
+      content: "";
+      position: absolute;
+      bottom: 0;
+      left: 50%;
+      transform: translateX(-50%);
+      width: 70upx;
+      height: 6upx;
+      background: #3385ff;
+    }
+  }
   .order_list {
     // height: 200upx;
     height: 100%;
     background: #f0f2f6;
-    padding: 0 0 120upx;
+    padding: 0 0 20upx;
     .list_item {
       margin: 20upx 0 0;
       // padding-left: 20upx;
@@ -136,13 +163,13 @@ export default {
         width: 280rpx;
         display: block;
         & > .store_title {
-          margin-bottom: 30upx;
-          width: 200rpx;
+          margin-bottom: 58upx;
+          width: 500rpx;
           white-space: nowrap;
           text-overflow: ellipsis;
           overflow: hidden;
           word-break: break-all;
-          font-size: 32upx;
+          font-size: 35upx;
           font-weight: 700;
           color: #333;
         }
@@ -153,15 +180,16 @@ export default {
       }
       & > .store_btn {
         position: absolute;
-        right: 20upx;
+        top:100upx;
+        left: 135upx;
         & > .btn_entrance {
           display: inline-block;
           font-size: 28upx;
           color: #3385ff;
           border: 1px solid #3385ff;
-          border-radius: 28px;
-          padding: 10upx 20upx;
-          margin-left: 20upx;
+          border-radius: 10px;
+          padding: 10upx 35upx;
+          margin-left: 45upx;
         }
         & > .btn_forbid {
           border: 1px solid #999;
@@ -174,13 +202,5 @@ export default {
     padding-top: 20upx;
     background-color: #f0f2f6;
   }
-  // 按钮
-.app-footer {
-	justify-content: flex-end;
-	.admin-button-com {
-		width: 180px;
-		margin-right: 30px;
-	}
-}
 }
 </style>