Browse Source

删除功能添加

asd26269546 2 years ago
parent
commit
0406c9dd29
93 changed files with 81 additions and 43 deletions
  1. 3 1
      pages/materialTransfer/materialTransfer.vue
  2. 1 1
      pages/materialTransfer/transferComposite.vue
  3. 26 2
      pages/materialTransfer/transferCompositeList.vue
  4. 4 1
      pages/usedTotal/return-warehouse.vue
  5. 0 0
      unpackage/dist/build/mp-weixin/pages/materialTransfer/materialTransfer.js
  6. 0 0
      unpackage/dist/build/mp-weixin/pages/materialTransfer/materialTransfer.wxml
  7. 0 0
      unpackage/dist/build/mp-weixin/pages/materialTransfer/materialTransfer.wxss
  8. 0 0
      unpackage/dist/build/mp-weixin/pages/materialTransfer/transferComposite.js
  9. 0 0
      unpackage/dist/build/mp-weixin/pages/materialTransfer/transferComposite.wxml
  10. 0 0
      unpackage/dist/build/mp-weixin/pages/materialTransfer/transferComposite.wxss
  11. 0 1
      unpackage/dist/build/mp-weixin/pages/materialTransfer/transferCompositeList.js
  12. 1 1
      unpackage/dist/build/mp-weixin/pages/materialTransfer/transferCompositeList.wxml
  13. 1 1
      unpackage/dist/build/mp-weixin/pages/materialTransfer/transferCompositeList.wxss
  14. 0 0
      unpackage/dist/build/mp-weixin/pages/usedTotal/return-warehouse.js
  15. 0 0
      unpackage/dist/build/mp-weixin/pages/usedTotal/return-warehouse.wxml
  16. 0 0
      unpackage/dist/build/mp-weixin/pages/usedTotal/return-warehouse.wxss
  17. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
  18. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
  19. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/components/commons-select-time/index.js.map
  20. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/components/htz-image-upload/htz-image-upload.js.map
  21. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/@dcloudio/uni-ui/lib/uni-badge/uni-badge.js.map
  22. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/@dcloudio/uni-ui/lib/uni-card/uni-card.js.map
  23. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/@dcloudio/uni-ui/lib/uni-col/uni-col.js.map
  24. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/@dcloudio/uni-ui/lib/uni-data-checkbox/uni-data-checkbox.js.map
  25. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/@dcloudio/uni-ui/lib/uni-datetime-picker/calendar-item.js.map
  26. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/@dcloudio/uni-ui/lib/uni-datetime-picker/calendar.js.map
  27. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/@dcloudio/uni-ui/lib/uni-datetime-picker/time-picker.js.map
  28. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/@dcloudio/uni-ui/lib/uni-datetime-picker/uni-datetime-picker.js.map
  29. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/@dcloudio/uni-ui/lib/uni-easyinput/uni-easyinput.js.map
  30. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/@dcloudio/uni-ui/lib/uni-forms-item/uni-forms-item.js.map
  31. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/@dcloudio/uni-ui/lib/uni-forms/uni-forms.js.map
  32. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/@dcloudio/uni-ui/lib/uni-icons/uni-icons.js.map
  33. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/@dcloudio/uni-ui/lib/uni-load-more/uni-load-more.js.map
  34. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/@dcloudio/uni-ui/lib/uni-number-box/uni-number-box.js.map
  35. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/@dcloudio/uni-ui/lib/uni-popup-message/uni-popup-message.js.map
  36. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/@dcloudio/uni-ui/lib/uni-popup/uni-popup.js.map
  37. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/@dcloudio/uni-ui/lib/uni-row/uni-row.js.map
  38. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/@dcloudio/uni-ui/lib/uni-search-bar/uni-search-bar.js.map
  39. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/@dcloudio/uni-ui/lib/uni-table/uni-table.js.map
  40. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/@dcloudio/uni-ui/lib/uni-td/uni-td.js.map
  41. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/@dcloudio/uni-ui/lib/uni-th/filter-dropdown.js.map
  42. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/@dcloudio/uni-ui/lib/uni-th/uni-th.js.map
  43. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/@dcloudio/uni-ui/lib/uni-tr/table-checkbox.js.map
  44. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/@dcloudio/uni-ui/lib/uni-tr/uni-tr.js.map
  45. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/Inventory/Inventory.js.map
  46. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/Inventory/InventoryDtl.js.map
  47. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/Inventory/InventorySubmit.js.map
  48. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/addQrcode/addBatch.js.map
  49. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/addQrcode/addQrcode.js.map
  50. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/addQrcode/selectQrcode.js.map
  51. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/check/check.js.map
  52. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/check/checkDtl.js.map
  53. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/check/checkSubmit.js.map
  54. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/goIn/goIn.js.map
  55. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/goIn/withdrawal.js.map
  56. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/goOut/goOut.js.map
  57. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/home.js.map
  58. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/inOut/inOut.js.map
  59. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
  60. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/manageQrcode/manageQrcode.js.map
  61. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/materialTransfer/materialTransfer.js.map
  62. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/materialTransfer/transferComposite.js.map
  63. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/materialTransfer/transferCompositeList.js.map
  64. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/overCloth/overCloth.js.map
  65. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/select/select.js.map
  66. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/shiftHandover/shiftHandover.js.map
  67. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/submit/submit.js.map
  68. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/succession/succession.js.map
  69. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/total/summary.js.map
  70. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/total/total.js.map
  71. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/total/warehouseDtl.js.map
  72. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/total/warehousingDtl.js.map
  73. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/usedTotal/fabric-correction.js.map
  74. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/usedTotal/return-warehouse.js.map
  75. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/usedTotal/summary.js.map
  76. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/usedTotal/usedTotal.js.map
  77. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/usedTotal/warehouse-list.js.map
  78. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/usedTotal/warehouseDtl.js.map
  79. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/usedTotal/warehousingDtl.js.map
  80. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/user/login.js.map
  81. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/weigh/checkDtl.js.map
  82. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/weigh/checkSubmit.js.map
  83. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/weigh/weigh.js.map
  84. 2 0
      unpackage/dist/dev/mp-weixin/pages/materialTransfer/materialTransfer.js
  85. 0 0
      unpackage/dist/dev/mp-weixin/pages/materialTransfer/materialTransfer.wxml
  86. 0 0
      unpackage/dist/dev/mp-weixin/pages/materialTransfer/transferComposite.wxml
  87. 21 1
      unpackage/dist/dev/mp-weixin/pages/materialTransfer/transferCompositeList.js
  88. 1 1
      unpackage/dist/dev/mp-weixin/pages/materialTransfer/transferCompositeList.wxml
  89. 7 0
      unpackage/dist/dev/mp-weixin/pages/materialTransfer/transferCompositeList.wxss
  90. 3 0
      unpackage/dist/dev/mp-weixin/pages/usedTotal/return-warehouse.js
  91. 0 0
      unpackage/dist/dev/mp-weixin/pages/usedTotal/return-warehouse.wxml
  92. 4 33
      unpackage/dist/dev/mp-weixin/project.config.json
  93. 7 0
      unpackage/dist/dev/mp-weixin/project.private.config.json

+ 3 - 1
pages/materialTransfer/materialTransfer.vue

@@ -91,7 +91,7 @@
 				</view>
 			</view>
 			<view class="search-box" v-if="current == 0">
-				<ul>
+				<ul  style="height: 60vh;overflow-y: scroll;">
 					<li @click="selectMaterialList(i)" v-for="i in pickingToday" :key="i.id">
 						{{i.name}}
 					</li>
@@ -198,8 +198,10 @@
 						}
 					}
 				}
+				uni.showLoading({title: '加载中',mask:true});
 				v.$post('/stockTransfer/add', this.form.backDetailList).then(res => {
 					console.log(res)
+					uni.hideLoading()
 					if (res.code == 200) {
 						uni.showToast({
 							title: '提交成功,跳转中!'

+ 1 - 1
pages/materialTransfer/transferComposite.vue

@@ -88,7 +88,7 @@
 				</view>
 			</view>
 			<view class="search-box" v-if="current == 0">
-				<ul>
+				<ul  style="height: 60vh;overflow-y: scroll;">
 					<li @click="selectMaterialList(i)" v-for="i in pickingToday" :key="i.id">
 						{{i.name}}
 					</li>

+ 26 - 2
pages/materialTransfer/transferCompositeList.vue

@@ -19,6 +19,7 @@
 					</view>
 				</view>
 				<view class="btn-warp">
+					<button @click="listDelete(i.id)" style="background-color: red;color:#fff">删除</button>
 					<button @click="operation(i.id)" style="background-color: blue;color:#fff">去复核</button>
 				</view>
 			</view>
@@ -41,6 +42,26 @@
 			},100)
 		},
 		methods:{
+			listDelete(_id){
+				const v = this
+				uni.showModal({
+					title: "提示",
+					content: "你确定删除此信息么?",
+					success(res) {
+						if (res.confirm) {
+							v.$post('/stockTransfer/delete',{
+								id:_id,
+							}).then(res=>{
+								uni.showToast({
+									title: '删除成功!',
+									icon:"none" 
+								})
+								v.getList()
+							})
+						}
+					}
+				})
+			},
 			operation(_id){
 				const v = this 
 				uni.navigateTo({
@@ -62,7 +83,6 @@
 						})
 					}
 				});
-				
 			},
 		},
 	}
@@ -91,7 +111,11 @@
 		}
 	}
 	.btn-warp{
-		
+		display: flex;
+		justify-content: space-between;
+		button{
+			width: 48%;
+		}
 	}
 	.footer-btn{
 		position: fixed;

+ 4 - 1
pages/usedTotal/return-warehouse.vue

@@ -80,7 +80,7 @@
 				</view>
 			</view>
 			<view class="search-box" v-if="current == 0">
-				<ul>
+				<ul  style="height: 60vh;overflow-y: scroll;">
 					<li @click="selectMaterialList(i)" v-for="i in pickingToday" :key="i.id">
 						{{i.materialName}}
 					</li>
@@ -174,9 +174,12 @@
 			submitBack(){
 				const v = this
 				console.log(v.form)
+				uni.showLoading({title: '加载中',mask:true});
 				v.$post('/stockBack/submitBack',v.form).then(res=>{
 					console.log(res)
+					uni.hideLoading()
 					if(res.code == 200){
+						uni.hideLoading()
 						uni.showToast({
 							title: '提交成功,跳转中!'
 						})

File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/materialTransfer/materialTransfer.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/materialTransfer/materialTransfer.wxml


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/materialTransfer/materialTransfer.wxss


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/materialTransfer/transferComposite.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/materialTransfer/transferComposite.wxml


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/materialTransfer/transferComposite.wxss


File diff suppressed because it is too large
+ 0 - 1
unpackage/dist/build/mp-weixin/pages/materialTransfer/transferCompositeList.js


+ 1 - 1
unpackage/dist/build/mp-weixin/pages/materialTransfer/transferCompositeList.wxml

@@ -1 +1 @@
-<view class="_div data-v-6826106e"><view class="ul data-v-6826106e"><block wx:for="{{dataList}}" wx:for-item="i" wx:for-index="__i0__" wx:key="id"><view class="li data-v-6826106e"><view class="line data-v-6826106e">{{'提交人员:'+i.submitUser+''}}<view class="span data-v-6826106e">接收人员:<label class="_span data-v-6826106e">{{i.receiveUser}}</label></view></view><view class="line data-v-6826106e">{{'提交时间:'+i.submitTime+''}}</view><view class="line data-v-6826106e">{{'面料卷数:'+i.submitNum+''}}<view class="span data-v-6826106e">面料米数:<label class="_span data-v-6826106e">{{i.submitMeters}}</label></view></view><view class="btn-warp data-v-6826106e"><button data-event-opts="{{[['tap',[['operation',['$0'],[[['dataList','id',i.id,'id']]]]]]]}}" style="background-color:blue;color:#fff;" bindtap="__e" class="data-v-6826106e">去复核</button></view></view></block></view></view>
+<view class="_div data-v-0e89a5f5"><view class="ul data-v-0e89a5f5"><block wx:for="{{dataList}}" wx:for-item="i" wx:for-index="__i0__" wx:key="id"><view class="li data-v-0e89a5f5"><view class="line data-v-0e89a5f5">{{'提交人员:'+i.submitUser+''}}<view class="span data-v-0e89a5f5">接收人员:<label class="_span data-v-0e89a5f5">{{i.receiveUser}}</label></view></view><view class="line data-v-0e89a5f5">{{'提交时间:'+i.submitTime+''}}</view><view class="line data-v-0e89a5f5">{{'面料卷数:'+i.submitNum+''}}<view class="span data-v-0e89a5f5">面料米数:<label class="_span data-v-0e89a5f5">{{i.submitMeters}}</label></view></view><view class="btn-warp data-v-0e89a5f5"><button data-event-opts="{{[['tap',[['listDelete',['$0'],[[['dataList','id',i.id,'id']]]]]]]}}" style="background-color:red;color:#fff;" bindtap="__e" class="data-v-0e89a5f5">删除</button><button data-event-opts="{{[['tap',[['operation',['$0'],[[['dataList','id',i.id,'id']]]]]]]}}" style="background-color:blue;color:#fff;" bindtap="__e" class="data-v-0e89a5f5">去复核</button></view></view></block></view></view>

+ 1 - 1
unpackage/dist/build/mp-weixin/pages/materialTransfer/transferCompositeList.wxss

@@ -1 +1 @@
-.ul.data-v-6826106e{min-height:100vh;background-color:#f2f2f2}.li.data-v-6826106e{background-color:#fff;margin:20rpx 20rpx 0;padding:20rpx;list-style:none}.li .line.data-v-6826106e{position:relative;line-height:70rpx;border:none;display:flex;padding:0 20rpx}.li .line .span.data-v-6826106e{position:absolute;left:50%}.footer-btn.data-v-6826106e{position:fixed;bottom:10rpx;left:10rpx;right:10rpx;background-color:red;color:#fff}
+.ul.data-v-0e89a5f5{min-height:100vh;background-color:#f2f2f2}.li.data-v-0e89a5f5{background-color:#fff;margin:20rpx 20rpx 0;padding:20rpx;list-style:none}.li .line.data-v-0e89a5f5{position:relative;line-height:70rpx;border:none;display:flex;padding:0 20rpx}.li .line .span.data-v-0e89a5f5{position:absolute;left:50%}.btn-warp.data-v-0e89a5f5{display:flex;justify-content:space-between}.btn-warp button.data-v-0e89a5f5{width:48%}.footer-btn.data-v-0e89a5f5{position:fixed;bottom:10rpx;left:10rpx;right:10rpx;background-color:red;color:#fff}

File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/usedTotal/return-warehouse.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/usedTotal/return-warehouse.wxml


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/usedTotal/return-warehouse.wxss


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/components/commons-select-time/index.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/components/htz-image-upload/htz-image-upload.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/@dcloudio/uni-ui/lib/uni-badge/uni-badge.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/@dcloudio/uni-ui/lib/uni-card/uni-card.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/@dcloudio/uni-ui/lib/uni-col/uni-col.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/@dcloudio/uni-ui/lib/uni-data-checkbox/uni-data-checkbox.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/@dcloudio/uni-ui/lib/uni-datetime-picker/calendar-item.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/@dcloudio/uni-ui/lib/uni-datetime-picker/calendar.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/@dcloudio/uni-ui/lib/uni-datetime-picker/time-picker.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/@dcloudio/uni-ui/lib/uni-datetime-picker/uni-datetime-picker.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/@dcloudio/uni-ui/lib/uni-easyinput/uni-easyinput.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/@dcloudio/uni-ui/lib/uni-forms-item/uni-forms-item.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/@dcloudio/uni-ui/lib/uni-forms/uni-forms.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/@dcloudio/uni-ui/lib/uni-icons/uni-icons.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/@dcloudio/uni-ui/lib/uni-load-more/uni-load-more.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/@dcloudio/uni-ui/lib/uni-number-box/uni-number-box.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/@dcloudio/uni-ui/lib/uni-popup-message/uni-popup-message.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/@dcloudio/uni-ui/lib/uni-popup/uni-popup.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/@dcloudio/uni-ui/lib/uni-row/uni-row.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/@dcloudio/uni-ui/lib/uni-search-bar/uni-search-bar.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/@dcloudio/uni-ui/lib/uni-table/uni-table.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/@dcloudio/uni-ui/lib/uni-td/uni-td.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/@dcloudio/uni-ui/lib/uni-th/filter-dropdown.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/@dcloudio/uni-ui/lib/uni-th/uni-th.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/@dcloudio/uni-ui/lib/uni-tr/table-checkbox.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/@dcloudio/uni-ui/lib/uni-tr/uni-tr.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/Inventory/Inventory.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/Inventory/InventoryDtl.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/Inventory/InventorySubmit.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/addQrcode/addBatch.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/addQrcode/addQrcode.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/addQrcode/selectQrcode.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/check/check.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/check/checkDtl.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/check/checkSubmit.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/goIn/goIn.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/goIn/withdrawal.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/goOut/goOut.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/home.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/inOut/inOut.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/manageQrcode/manageQrcode.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/materialTransfer/materialTransfer.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/materialTransfer/transferComposite.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/materialTransfer/transferCompositeList.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/overCloth/overCloth.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/select/select.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shiftHandover/shiftHandover.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/submit/submit.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/succession/succession.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/total/summary.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/total/total.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/total/warehouseDtl.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/total/warehousingDtl.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/usedTotal/fabric-correction.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/usedTotal/return-warehouse.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/usedTotal/summary.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/usedTotal/usedTotal.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/usedTotal/warehouse-list.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/usedTotal/warehouseDtl.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/usedTotal/warehousingDtl.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/user/login.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/weigh/checkDtl.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/weigh/checkSubmit.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/weigh/weigh.js.map


+ 2 - 0
unpackage/dist/dev/mp-weixin/pages/materialTransfer/materialTransfer.js

@@ -384,8 +384,10 @@ var _default =
           }
         }
       }
+      uni.showLoading({ title: '加载中', mask: true });
       v.$post('/stockTransfer/add', this.form.backDetailList).then(function (res) {
         console.log(res);
+        uni.hideLoading();
         if (res.code == 200) {
           uni.showToast({
             title: '提交成功,跳转中!' });

File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/mp-weixin/pages/materialTransfer/materialTransfer.wxml


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/mp-weixin/pages/materialTransfer/transferComposite.wxml


+ 21 - 1
unpackage/dist/dev/mp-weixin/pages/materialTransfer/transferCompositeList.js

@@ -160,6 +160,7 @@ __webpack_require__.r(__webpack_exports__);
 //
 //
 //
+//
 var _default =
 {
   name: "xx",
@@ -175,6 +176,26 @@ var _default =
     }, 100);
   },
   methods: {
+    listDelete: function listDelete(_id) {
+      var v = this;
+      uni.showModal({
+        title: "提示",
+        content: "你确定删除此信息么?",
+        success: function success(res) {
+          if (res.confirm) {
+            v.$post('/stockTransfer/delete', {
+              id: _id }).
+            then(function (res) {
+              uni.showToast({
+                title: '删除成功!',
+                icon: "none" });
+
+              v.getList();
+            });
+          }
+        } });
+
+    },
     operation: function operation(_id) {
       var v = this;
       uni.navigateTo({
@@ -196,7 +217,6 @@ var _default =
           });
         } });
 
-
     } } };exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))
 

+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/materialTransfer/transferCompositeList.wxml

@@ -1 +1 @@
-<view class="_div data-v-6aa3ecb6"><view class="ul data-v-6aa3ecb6"><block wx:for="{{dataList}}" wx:for-item="i" wx:for-index="__i0__" wx:key="id"><view class="li data-v-6aa3ecb6"><view class="line data-v-6aa3ecb6">{{'提交人员:'+i.submitUser+''}}<view class="span data-v-6aa3ecb6">接收人员:<label class="_span data-v-6aa3ecb6">{{i.receiveUser}}</label></view></view><view class="line data-v-6aa3ecb6">{{'提交时间:'+i.submitTime+''}}</view><view class="line data-v-6aa3ecb6">{{'面料卷数:'+i.submitNum+''}}<view class="span data-v-6aa3ecb6">面料米数:<label class="_span data-v-6aa3ecb6">{{i.submitMeters}}</label></view></view><view class="btn-warp data-v-6aa3ecb6"><button data-event-opts="{{[['tap',[['operation',['$0'],[[['dataList','id',i.id,'id']]]]]]]}}" style="background-color:blue;color:#fff;" bindtap="__e" class="data-v-6aa3ecb6">去复核</button></view></view></block></view></view>
+<view class="_div data-v-6aa3ecb6"><view class="ul data-v-6aa3ecb6"><block wx:for="{{dataList}}" wx:for-item="i" wx:for-index="__i0__" wx:key="id"><view class="li data-v-6aa3ecb6"><view class="line data-v-6aa3ecb6">{{'提交人员:'+i.submitUser+''}}<view class="span data-v-6aa3ecb6">接收人员:<label class="_span data-v-6aa3ecb6">{{i.receiveUser}}</label></view></view><view class="line data-v-6aa3ecb6">{{'提交时间:'+i.submitTime+''}}</view><view class="line data-v-6aa3ecb6">{{'面料卷数:'+i.submitNum+''}}<view class="span data-v-6aa3ecb6">面料米数:<label class="_span data-v-6aa3ecb6">{{i.submitMeters}}</label></view></view><view class="btn-warp data-v-6aa3ecb6"><button data-event-opts="{{[['tap',[['listDelete',['$0'],[[['dataList','id',i.id,'id']]]]]]]}}" style="background-color:red;color:#fff;" bindtap="__e" class="data-v-6aa3ecb6">删除</button><button data-event-opts="{{[['tap',[['operation',['$0'],[[['dataList','id',i.id,'id']]]]]]]}}" style="background-color:blue;color:#fff;" bindtap="__e" class="data-v-6aa3ecb6">去复核</button></view></view></block></view></view>

+ 7 - 0
unpackage/dist/dev/mp-weixin/pages/materialTransfer/transferCompositeList.wxss

@@ -19,6 +19,13 @@
   position: absolute;
   left: 50%;
 }
+.btn-warp.data-v-6aa3ecb6 {
+  display: flex;
+  justify-content: space-between;
+}
+.btn-warp button.data-v-6aa3ecb6 {
+  width: 48%;
+}
 .footer-btn.data-v-6aa3ecb6 {
   position: fixed;
   bottom: 10rpx;

+ 3 - 0
unpackage/dist/dev/mp-weixin/pages/usedTotal/return-warehouse.js

@@ -346,9 +346,12 @@ var _default =
     submitBack: function submitBack() {
       var v = this;
       console.log(v.form);
+      uni.showLoading({ title: '加载中', mask: true });
       v.$post('/stockBack/submitBack', v.form).then(function (res) {
         console.log(res);
+        uni.hideLoading();
         if (res.code == 200) {
+          uni.hideLoading();
           uni.showToast({
             title: '提交成功,跳转中!' });
 

File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/mp-weixin/pages/usedTotal/return-warehouse.wxml


+ 4 - 33
unpackage/dist/dev/mp-weixin/project.config.json

@@ -1,39 +1,14 @@
 {
-  "description": "项目配置文件,详见文档:https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
+  "description": "项目配置文件",
   "packOptions": {
-    "ignore": [],
-    "include": []
+    "ignore": []
   },
   "setting": {
     "urlCheck": false,
-    "es6": true,
-    "coverView": true,
-    "postcss": true,
-    "lazyloadPlaceholderEnable": false,
-    "preloadBackgroundData": false,
-    "minified": true,
-    "autoAudits": false,
-    "uglifyFileName": false,
-    "uploadWithSourceMap": true,
-    "enhance": true,
-    "useMultiFrameRuntime": true,
-    "showShadowRootInWxmlPanel": true,
-    "packNpmManually": false,
-    "packNpmRelationList": [],
-    "minifyWXSS": true,
-    "useStaticServer": true,
-    "showES6CompileOption": false,
-    "checkInvalidKey": true,
-    "babelSetting": {
-      "ignore": [],
-      "disablePlugins": [],
-      "outputPath": ""
-    },
-    "disableUseStrict": false,
-    "useCompilerPlugins": false
+    "es6": true
   },
   "compileType": "miniprogram",
-  "libVersion": "2.25.1",
+  "libVersion": "",
   "appid": "wxe4a17c2bc0287527",
   "projectname": "wechat",
   "condition": {
@@ -53,9 +28,5 @@
       "current": -1,
       "list": []
     }
-  },
-  "editorSetting": {
-    "tabIndent": "insertSpaces",
-    "tabSize": 2
   }
 }

+ 7 - 0
unpackage/dist/dev/mp-weixin/project.private.config.json

@@ -235,6 +235,13 @@
           "query": "",
           "launchMode": "default",
           "scene": null
+        },
+        {
+          "name": "",
+          "pathName": "pages/materialTransfer/transferCompositeList",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
         }
       ]
     }

Some files were not shown because too many files changed in this diff