优化审核模块

common/http.interceptor.js

@@ -3,18 +3,18 @@
 const install = (Vue, vm) => {
 	let baseURL;
 	if (process.env.NODE_ENV === 'development') {
-		// baseURL = "https://test.wms.tubaosoft.com/prod-api"
-		baseURL = "https://zd.tubaosoft.com/prod-api"
-		// baseURL = "http://192.168.1.177:9020"
+		baseURL = "https://test.wms.tubaosoft.com/prod-api"
+		// baseURL = "https://zd.tubaosoft.com/prod-api"
+		// baseURL = "http://192.168.1.177:9010"
 		// baseURL = "https://ap.tubaosoft.com/prod-api"
 		// baseURL = "https://dmu.tubaosoft.com/prod-api"
 		// baseURL = "https://jingang.tubaosoft.com/prod-api"
 		// baseURL = "https://jiyong.tubaosoft.com/prod-api"
 	}
 	if (process.env.NODE_ENV === 'production') {
-		baseURL = "https://zd.tubaosoft.com/prod-api"
+		// baseURL = "https://zd.tubaosoft.com/prod-api"
 		// baseURL = "https://jiyong.tubaosoft.com/prod-api"
-		// baseURL = "https://jingang.tubaosoft.com/prod-api"
+		baseURL = "https://jingang.tubaosoft.com/prod-api"
 		// baseURL = "https://ap.tubaosoft.com/prod-api"
 		// baseURL = "https://dmu.tubaosoft.com/prod-api"
 	}
@@ -22,7 +22,7 @@ const install = (Vue, vm) => {
 		baseUrl: baseURL,
 		// 如果将此值设置为true，拦截回调中将会返回服务端返回的所有数据response，而不是response.data
 		// 设置为true后，就需要在this.$u.http.interceptor.response进行多一次的判断，请打印查看具体值
-		// originalData: true, 
+		// originalData: true,
 		// 设置自定义头部content-type
 		// header: {
 		// 	'content-type': 'xxx'

manifest.json

@@ -2,8 +2,8 @@
     "name" : "TuBaoSoft",
     "appid" : "__UNI__38FA993",
     "description" : "",
-    "versionName" : "1.0.21",
-    "versionCode" : 21,
+    "versionName" : "1.0.22",
+    "versionCode" : 22,
     "transformPx" : false,
     "app-plus" : {
         // APP-VUE分包，可提APP升启动速度，2.7.12开始支持，兼容微信小程序分包方案，默认关闭

pages/home/delivery/orderDetails/index.vue

@@ -28,10 +28,10 @@
 				<view>箱号</view>
 				<view>{{form.cntrno}}</view>
 			</view>
-			<view class="basic">
+			<!-- <view class="basic">
 				<view>出库日期</view>
 				<view>{{form.bsdate}}</view>
-			</view>
+			</view> -->
 			<view class="basic">
 				<view>出库状态</view>
 				<view>{{form.billstatus}}</view>
@@ -103,6 +103,12 @@
 					<u-input type="type" :clearable="false" v-model="warehouseInformation" placeholder="请选择库区" disabled
 						@click="formation = !formation" />
 				</u-form-item>
+			</view>
+			<view class="basic" style="margin: 0 auto;height: 55rpx;">
+				<u-form-item style="width: 100%;" :border-bottom="false" label-width="160rpx" label="出库日期：">
+					<u-calendar v-model="show_bsdate" mode="date" max-date="2050" @change="changeBsdate"></u-calendar>
+					<u-input type="type" :clearable="false" v-model="form.bsdate" placeholder="请选择日期" disabled @click="show_bsdate = !show_bsdate"/>
+				</u-form-item>
 			</view>
 			<view class="basic" style="margin: 0 auto;height: 55rpx;">
 				<u-form-item style="width: 100%;" :border-bottom="false" label-width="130rpx" label="装卸工：">
@@ -133,9 +139,8 @@
 		<br>
 		<view
 			style="width: 100%;position:fixed; bottom:0;background-color: #FFFFFF;padding-left: 20px;padding-right: 20px;">
-			<u-button type="primary" @click="appCheckCode" v-if="form.billstatus == '出库中'">出库确认</u-button>
-			<u-button type="primary" @click="appCheckCode"
-				v-else-if="form.billstatus == '计划'||form.billstatus == '待出库'">叫车进场</u-button>
+			<u-button type="primary" @click="appCheckCode" v-if="entryPrinting != 0?form.billstatus == '出库中'||form.billstatus == '计划'||form.billstatus == '待出库':form.billstatus == '出库中'">出库确认</u-button>
+			<u-button type="primary" @click="appCheckCode" v-else-if="entryPrinting == 0?form.billstatus == '计划'||form.billstatus == '待出库':false">叫车进场</u-button>
 		</view>
 		<u-modal v-model="submIt" @confirm="submit" :content="content" @cancel="submIt = false"
 			:show-cancel-button="true" />
@@ -151,7 +156,8 @@
 				urldata: "",
 				CheckStatus: false,
 				title: '', //标题
-				formation: false,
+				formation: false,
+				show_bsdate:false,
 				list: [],
 				action: this.$u.http.config.baseUrl + '/common/upload',
 				// action: 'https://test.tms.tubaosoft.com/prod-api/common/upload',
@@ -184,10 +190,15 @@
 					unLoadAddrL: '', //卸车地点
 					unLadDate: '', //卸车时间
 					unLoadAttnTel: '' //卸车联系
-				}
+				},
+				entryPrinting:1,
 			}
 		},
-		onLoad: function(option) { //option为object类型，会序列化上个页面传递的参数
+		onLoad: function(option) { //option为object类型，会序列化上个页面传递的参数
+			this.$u.get('/system/config/configKey/entry.printing').then(res =>{
+				// console.log(res)
+				this.entryPrinting = res.msg
+			})
 			// console.log(option); //打印出上个页面传递的参数.
 			let listi = {
 				fId: JSON.parse(decodeURIComponent(option.item)).fId
@@ -227,7 +238,10 @@
 				uni.hideLoading();
 			}, 1000);
 		},
-		methods: {
+		methods: {
+			changeBsdate(e){
+				this.form.bsdate = e.result
+			},
 			getForm() {
 				this.$u.get('/warehouseBusiness/applets/appWarehouseItemDataById', {
 					fId: this.form.fId

pages/home/myorder/orderDetails/index.vue

@@ -28,10 +28,10 @@
 				<view>箱号</view>
 				<view>{{form.cntrno}}</view>
 			</view>
-			<view class="basic">
+			<!-- <view class="basic">
 				<view>入库日期</view>
 				<view>{{form.bsdate}}</view>
-			</view>
+			</view> -->
 			<view class="basic">
 				<view>入库状态</view>
 				<view>{{form.billstatus}}</view>
@@ -103,6 +103,12 @@
 					<u-input type="type" :clearable="false" v-model="warehouseInformation" placeholder="请选择库区" disabled @click="formation = !formation"/>
 				</u-form-item>
 			</view>
+			<view class="basic" style="margin: 0 auto;height: 55rpx;">
+				<u-form-item style="width: 100%;" :border-bottom="false" label-width="160rpx" label="入库日期：">
+					<u-calendar v-model="show_bsdate" mode="date" max-date="2050" @change="changeBsdate"></u-calendar>
+					<u-input type="type" :clearable="false" v-model="form.bsdate" placeholder="请选择日期" disabled @click="show_bsdate = !show_bsdate"/>
+				</u-form-item>
+			</view>
 			<view class="basic" style="margin: 0 auto;">
 				<u-form-item style="width: 100%;" :border-bottom="false" label-width="100rpx" label="备注：">
 					<u-input type="textarea" height="20rpx" :clearable="false" v-model="form.remark" />
@@ -126,8 +132,8 @@
 		</view>
 		<br>
 		<view style="width: 100%;position:fixed; bottom:0;background-color: #FFFFFF;padding-left: 20px;padding-right: 20px;">
-			<u-button type="primary" @click="appCheckCode" v-if="form.billstatus == '入库中'">入库确认</u-button>
-			<u-button type="primary" @click="appCheckCode" v-else-if="form.billstatus == '计划'||form.billstatus == '待入库'">叫车进场</u-button>
+			<u-button type="primary" @click="appCheckCode" v-if="entryPrinting != 0?form.billstatus == '入库中'||form.billstatus == '计划'||form.billstatus == '待入库':form.billstatus == '入库中'">入库确认</u-button>
+			<u-button type="primary" @click="appCheckCode" v-else-if="entryPrinting == 0?form.billstatus == '计划'||form.billstatus == '待入库':false">叫车进场</u-button>
 		</view>
 		<u-modal v-model="submIt" @confirm="submit" :content="content" @cancel="submIt = false" :show-cancel-button="true" />
 		<u-modal v-model="CheckStatus" @confirm="getForm" :content="content2" @cancel="CheckStatus = false"
@@ -146,7 +152,8 @@
 				},
 				content: '是否确认提交',
 				content2: "数据发生变化，是否需要更新一下？",
-				fileList: [],
+				fileList: [],
+				show_bsdate:false,
 				submIt: false,
 				formation: false,
 				list: [],
@@ -155,10 +162,15 @@
 				warehouseInformation: '',
 				form: {},
 				CheckStatus: false,
-				warehouseBills:{}
+				warehouseBills:{},
+				entryPrinting:1,
 			}
 		},
-		onLoad: function(option) { //option为object类型，会序列化上个页面传递的参数
+		onLoad: function(option) { //option为object类型，会序列化上个页面传递的参数
+			this.$u.get('/system/config/configKey/entry.printing').then(res =>{
+				// console.log(res)
+				this.entryPrinting = res.msg
+			})
 			console.log(option); //打印出上个页面传递的参数.
 			let listi = {
 				fId:JSON.parse(decodeURIComponent(option.item)).fId
@@ -208,7 +220,10 @@
 				uni.hideLoading();
 			}, 1000);
 		},
-		methods: {
+		methods: {
+			changeBsdate(e){
+				this.form.bsdate = e.result
+			},
 			getForm() {
 				this.$u.get('/warehouseBusiness/applets/appWarehouseItemDataById',{fId: this.form.fId}).then(res => {
 					this.form = res.data.item

pages/home/patrolInspection/index.vue

@@ -112,7 +112,8 @@
 			},
 			query() {
 				// this.current = null
-				this.$u.get('/warehouse/checkitems/listByUser', this.form).then(res => {
+				this.$u.get('/warehouse/checkitems/listByUser', this.form).then(res => {
+					console.log(res)
 					this.dataList = this.dataList.concat(res.rows)
 					this.total = res.total
 					if (res.total === 0) this.status = 'nomore'
@@ -140,7 +141,7 @@
 						pageNum: 1,
 						pageSize: 10
 					}
-				this.query()
+					this.query()
 				}
 				this.current = index;
 			},

pages/home/patrolInspection/patrolDetails.vue

@@ -49,7 +49,7 @@
 					<h3>上传附件</h3>
 				</view>
 				<view>
-					<u-upload style="width: 100%;" :action="action" @on-success="success" :file-list="fileList" :header="headers"></u-upload>
+					<u-upload style="width: 100%;" :action="action" @on-success="success" @on-remove="remove" :file-list="fileList" :header="headers"></u-upload>
 				</view>
 			</view>
 		</view>
@@ -100,14 +100,17 @@
 					this.fileList = []
 					for (let item in JSON.parse(res.rows[0].fPhotoUrl)) {
 						this.fileList.push(JSON.parse(res.rows[0].fPhotoUrl)[item])
-					}
+					}
+					this.pictureEist = this.fileList
 				}
 			})
 		},
 		created() {},
 		methods: {
 			submit() {
-				console.log(this.twarehousecheckdetailList)
+				// console.log(this.twarehousecheckdetailList)
+				// console.log(this.fileList)
+				// console.log(this.pictureEist)
 				this.twarehousecheckdetailList.fPhotoUrl = []
 				for (let item in this.pictureEist) {
 					if (this.pictureEist[item].response) {
@@ -140,7 +143,11 @@
 				}
 			},
 			success(data, index, lists, name) {
-				console.log(lists)
+				// console.log(lists)
+				this.pictureEist = lists
+			},
+			remove(index, lists, name) {
+				// console.log(index,lists)
 				this.pictureEist = lists
 			}
 		}

unpackage/dist/dev/app-plus/app-view.js

@@ -10349,6 +10349,8 @@ try {
       .default,
     uInput: __webpack_require__(/*! @/uview-ui/components/u-input/u-input.vue */ 276).default,
     uSelect: __webpack_require__(/*! @/uview-ui/components/u-select/u-select.vue */ 284).default,
+    uCalendar: __webpack_require__(/*! @/uview-ui/components/u-calendar/u-calendar.vue */ 204)
+      .default,
     uUpload: __webpack_require__(/*! @/uview-ui/components/u-upload/u-upload.vue */ 292).default,
     uButton: __webpack_require__(/*! @/uview-ui/components/u-button/u-button.vue */ 155).default,
     uModal: __webpack_require__(/*! @/uview-ui/components/u-modal/u-modal.vue */ 308).default
@@ -10463,7 +10465,7 @@ var render = function() {
             "v-uni-view",
             { staticClass: _vm._$g(22, "sc"), attrs: { _i: 22 } },
             [
-              _c("v-uni-view", { attrs: { _i: 23 } }, [_vm._v("入库日期")]),
+              _c("v-uni-view", { attrs: { _i: 23 } }, [_vm._v("入库状态")]),
               _c("v-uni-view", { attrs: { _i: 24 } }, [
                 _vm._v(_vm._$g(24, "t0-0"))
               ])
@@ -10474,7 +10476,7 @@ var render = function() {
             "v-uni-view",
             { staticClass: _vm._$g(25, "sc"), attrs: { _i: 25 } },
             [
-              _c("v-uni-view", { attrs: { _i: 26 } }, [_vm._v("入库状态")]),
+              _c("v-uni-view", { attrs: { _i: 26 } }, [_vm._v("品名")]),
               _c("v-uni-view", { attrs: { _i: 27 } }, [
                 _vm._v(_vm._$g(27, "t0-0"))
               ])
@@ -10485,7 +10487,7 @@ var render = function() {
             "v-uni-view",
             { staticClass: _vm._$g(28, "sc"), attrs: { _i: 28 } },
             [
-              _c("v-uni-view", { attrs: { _i: 29 } }, [_vm._v("品名")]),
+              _c("v-uni-view", { attrs: { _i: 29 } }, [_vm._v("车号")]),
               _c("v-uni-view", { attrs: { _i: 30 } }, [
                 _vm._v(_vm._$g(30, "t0-0"))
               ])
@@ -10496,7 +10498,7 @@ var render = function() {
             "v-uni-view",
             { staticClass: _vm._$g(31, "sc"), attrs: { _i: 31 } },
             [
-              _c("v-uni-view", { attrs: { _i: 32 } }, [_vm._v("车号")]),
+              _c("v-uni-view", { attrs: { _i: 32 } }, [_vm._v("司机")]),
               _c("v-uni-view", { attrs: { _i: 33 } }, [
                 _vm._v(_vm._$g(33, "t0-0"))
               ])
@@ -10507,7 +10509,7 @@ var render = function() {
             "v-uni-view",
             { staticClass: _vm._$g(34, "sc"), attrs: { _i: 34 } },
             [
-              _c("v-uni-view", { attrs: { _i: 35 } }, [_vm._v("司机")]),
+              _c("v-uni-view", { attrs: { _i: 35 } }, [_vm._v("司机电话")]),
               _c("v-uni-view", { attrs: { _i: 36 } }, [
                 _vm._v(_vm._$g(36, "t0-0"))
               ])
@@ -10518,7 +10520,7 @@ var render = function() {
             "v-uni-view",
             { staticClass: _vm._$g(37, "sc"), attrs: { _i: 37 } },
             [
-              _c("v-uni-view", { attrs: { _i: 38 } }, [_vm._v("司机电话")]),
+              _c("v-uni-view", { attrs: { _i: 38 } }, [_vm._v("货物属性")]),
               _c("v-uni-view", { attrs: { _i: 39 } }, [
                 _vm._v(_vm._$g(39, "t0-0"))
               ])
@@ -10529,7 +10531,7 @@ var render = function() {
             "v-uni-view",
             { staticClass: _vm._$g(40, "sc"), attrs: { _i: 40 } },
             [
-              _c("v-uni-view", { attrs: { _i: 41 } }, [_vm._v("货物属性")]),
+              _c("v-uni-view", { attrs: { _i: 41 } }, [_vm._v("属性详情")]),
               _c("v-uni-view", { attrs: { _i: 42 } }, [
                 _vm._v(_vm._$g(42, "t0-0"))
               ])
@@ -10540,42 +10542,31 @@ var render = function() {
             "v-uni-view",
             { staticClass: _vm._$g(43, "sc"), attrs: { _i: 43 } },
             [
-              _c("v-uni-view", { attrs: { _i: 44 } }, [_vm._v("属性详情")]),
+              _c("v-uni-view", { attrs: { _i: 44 } }, [_vm._v("劳务公司")]),
               _c("v-uni-view", { attrs: { _i: 45 } }, [
                 _vm._v(_vm._$g(45, "t0-0"))
               ])
             ],
             1
-          ),
-          _c(
-            "v-uni-view",
-            { staticClass: _vm._$g(46, "sc"), attrs: { _i: 46 } },
-            [
-              _c("v-uni-view", { attrs: { _i: 47 } }, [_vm._v("劳务公司")]),
-              _c("v-uni-view", { attrs: { _i: 48 } }, [
-                _vm._v(_vm._$g(48, "t0-0"))
-              ])
-            ],
-            1
           )
         ],
         1
       ),
       _c(
         "v-uni-view",
-        { staticClass: _vm._$g(49, "sc"), attrs: { _i: 49 } },
+        { staticClass: _vm._$g(46, "sc"), attrs: { _i: 46 } },
         [
           _c(
             "v-uni-view",
-            { attrs: { _i: 50 } },
+            { attrs: { _i: 47 } },
             [
               _c("v-uni-view", {
-                staticClass: _vm._$g(51, "sc"),
-                attrs: { _i: 51 }
+                staticClass: _vm._$g(48, "sc"),
+                attrs: { _i: 48 }
               }),
               _c(
                 "v-uni-text",
-                { staticClass: _vm._$g(52, "sc"), attrs: { _i: 52 } },
+                { staticClass: _vm._$g(49, "sc"), attrs: { _i: 49 } },
                 [_vm._v("可编辑")]
               )
             ],
@@ -10583,8 +10574,34 @@ var render = function() {
           ),
           _c(
             "v-uni-view",
-            { staticClass: _vm._$g(53, "sc"), attrs: { _i: 53 } },
-            [_c("u-line", { attrs: { _i: 54 } })],
+            { staticClass: _vm._$g(50, "sc"), attrs: { _i: 50 } },
+            [_c("u-line", { attrs: { _i: 51 } })],
+            1
+          ),
+          _c(
+            "v-uni-view",
+            {
+              staticClass: _vm._$g(52, "sc"),
+              staticStyle: { margin: "0 auto", height: "55rpx" },
+              attrs: { _i: 52 }
+            },
+            [
+              _c(
+                "u-form-item",
+                { staticStyle: { width: "100%" }, attrs: { _i: 53 } },
+                [
+                  _c("u-input", {
+                    attrs: { _i: 54 },
+                    model: {
+                      value: _vm._$g(54, "v-model"),
+                      callback: function() {},
+                      expression: "form.fQty"
+                    }
+                  })
+                ],
+                1
+              )
+            ],
             1
           ),
           _c(
@@ -10604,7 +10621,7 @@ var render = function() {
                     model: {
                       value: _vm._$g(57, "v-model"),
                       callback: function() {},
-                      expression: "form.fQty"
+                      expression: "form.fGrossweight"
                     }
                   })
                 ],
@@ -10630,7 +10647,7 @@ var render = function() {
                     model: {
                       value: _vm._$g(60, "v-model"),
                       callback: function() {},
-                      expression: "form.fGrossweight"
+                      expression: "form.fNetweight"
                     }
                   })
                 ],
@@ -10656,7 +10673,7 @@ var render = function() {
                     model: {
                       value: _vm._$g(63, "v-model"),
                       callback: function() {},
-                      expression: "form.fNetweight"
+                      expression: "form.fStevedore"
                     }
                   })
                 ],
@@ -10677,12 +10694,30 @@ var render = function() {
                 "u-form-item",
                 { staticStyle: { width: "100%" }, attrs: { _i: 65 } },
                 [
-                  _c("u-input", {
+                  _c("u-select", {
                     attrs: { _i: 66 },
+                    on: {
+                      confirm: function($event) {
+                        return _vm.$handleViewEvent($event)
+                      }
+                    },
                     model: {
                       value: _vm._$g(66, "v-model"),
                       callback: function() {},
-                      expression: "form.fStevedore"
+                      expression: "formation"
+                    }
+                  }),
+                  _c("u-input", {
+                    attrs: { _i: 67 },
+                    on: {
+                      click: function($event) {
+                        return _vm.$handleViewEvent($event)
+                      }
+                    },
+                    model: {
+                      value: _vm._$g(67, "v-model"),
+                      callback: function() {},
+                      expression: "warehouseInformation"
                     }
                   })
                 ],
@@ -10694,39 +10729,39 @@ var render = function() {
           _c(
             "v-uni-view",
             {
-              staticClass: _vm._$g(67, "sc"),
+              staticClass: _vm._$g(68, "sc"),
               staticStyle: { margin: "0 auto", height: "55rpx" },
-              attrs: { _i: 67 }
+              attrs: { _i: 68 }
             },
             [
               _c(
                 "u-form-item",
-                { staticStyle: { width: "100%" }, attrs: { _i: 68 } },
+                { staticStyle: { width: "100%" }, attrs: { _i: 69 } },
                 [
-                  _c("u-select", {
-                    attrs: { _i: 69 },
+                  _c("u-calendar", {
+                    attrs: { _i: 70 },
                     on: {
-                      confirm: function($event) {
+                      change: function($event) {
                         return _vm.$handleViewEvent($event)
                       }
                     },
                     model: {
-                      value: _vm._$g(69, "v-model"),
+                      value: _vm._$g(70, "v-model"),
                       callback: function() {},
-                      expression: "formation"
+                      expression: "show_bsdate"
                     }
                   }),
                   _c("u-input", {
-                    attrs: { _i: 70 },
+                    attrs: { _i: 71 },
                     on: {
                       click: function($event) {
                         return _vm.$handleViewEvent($event)
                       }
                     },
                     model: {
-                      value: _vm._$g(70, "v-model"),
+                      value: _vm._$g(71, "v-model"),
                       callback: function() {},
-                      expression: "warehouseInformation"
+                      expression: "form.bsdate"
                     }
                   })
                 ],
@@ -10738,19 +10773,19 @@ var render = function() {
           _c(
             "v-uni-view",
             {
-              staticClass: _vm._$g(71, "sc"),
+              staticClass: _vm._$g(72, "sc"),
               staticStyle: { margin: "0 auto" },
-              attrs: { _i: 71 }
+              attrs: { _i: 72 }
             },
             [
               _c(
                 "u-form-item",
-                { staticStyle: { width: "100%" }, attrs: { _i: 72 } },
+                { staticStyle: { width: "100%" }, attrs: { _i: 73 } },
                 [
                   _c("u-input", {
-                    attrs: { _i: 73 },
+                    attrs: { _i: 74 },
                     model: {
-                      value: _vm._$g(73, "v-model"),
+                      value: _vm._$g(74, "v-model"),
                       callback: function() {},
                       expression: "form.remark"
                     }
@@ -10764,33 +10799,33 @@ var render = function() {
         ],
         1
       ),
-      _vm._$g(74, "i")
+      _vm._$g(75, "i")
         ? _c(
             "v-uni-view",
             {
-              staticClass: _vm._$g(74, "sc"),
+              staticClass: _vm._$g(75, "sc"),
               staticStyle: { "margin-bottom": "60rpx" },
-              attrs: { _i: 74 }
+              attrs: { _i: 75 }
             },
             [
               _c(
                 "v-uni-view",
-                { attrs: { _i: 75 } },
+                { attrs: { _i: 76 } },
                 [
                   _c("v-uni-view", {
-                    staticClass: _vm._$g(76, "sc"),
-                    attrs: { _i: 76 }
+                    staticClass: _vm._$g(77, "sc"),
+                    attrs: { _i: 77 }
                   }),
                   _c(
                     "v-uni-text",
-                    { staticClass: _vm._$g(77, "sc"), attrs: { _i: 77 } },
+                    { staticClass: _vm._$g(78, "sc"), attrs: { _i: 78 } },
                     [_vm._v("附件上传")]
                   ),
                   _c(
                     "v-uni-view",
                     {
-                      staticClass: _vm._$g(78, "sc"),
-                      attrs: { _i: 78 },
+                      staticClass: _vm._$g(79, "sc"),
+                      attrs: { _i: 79 },
                       on: {
                         click: function($event) {
                           return _vm.$handleViewEvent($event)
@@ -10804,20 +10839,20 @@ var render = function() {
               ),
               _c(
                 "v-uni-view",
-                { staticClass: _vm._$g(79, "sc"), attrs: { _i: 79 } },
-                [_c("u-line", { attrs: { _i: 80 } })],
+                { staticClass: _vm._$g(80, "sc"), attrs: { _i: 80 } },
+                [_c("u-line", { attrs: { _i: 81 } })],
                 1
               ),
               _c(
                 "v-uni-view",
                 {
                   staticStyle: { width: "94%", margin: "0 auto" },
-                  attrs: { _i: 81 }
+                  attrs: { _i: 82 }
                 },
                 [
                   _c("u-upload", {
                     ref: "uUpload",
-                    attrs: { _i: 82 },
+                    attrs: { _i: 83 },
                     on: {
                       "on-remove": function($event) {
                         return _vm.$handleViewEvent($event)
@@ -10834,7 +10869,7 @@ var render = function() {
             1
           )
         : _vm._e(),
-      _c("br", { attrs: { _i: 83 } }),
+      _c("br", { attrs: { _i: 84 } }),
       _c(
         "v-uni-view",
         {
@@ -10846,14 +10881,14 @@ var render = function() {
             "padding-left": "20px",
             "padding-right": "20px"
           },
-          attrs: { _i: 84 }
+          attrs: { _i: 85 }
         },
         [
-          _vm._$g(85, "i")
+          _vm._$g(86, "i")
             ? _c(
                 "u-button",
                 {
-                  attrs: { _i: 85 },
+                  attrs: { _i: 86 },
                   on: {
                     click: function($event) {
                       return _vm.$handleViewEvent($event)
@@ -10862,11 +10897,11 @@ var render = function() {
                 },
                 [_vm._v("入库确认")]
               )
-            : _vm._$g(86, "e")
+            : _vm._$g(87, "e")
             ? _c(
                 "u-button",
                 {
-                  attrs: { _i: 86 },
+                  attrs: { _i: 87 },
                   on: {
                     click: function($event) {
                       return _vm.$handleViewEvent($event)
@@ -10880,7 +10915,7 @@ var render = function() {
         1
       ),
       _c("u-modal", {
-        attrs: { _i: 87 },
+        attrs: { _i: 88 },
         on: {
           confirm: function($event) {
             return _vm.$handleViewEvent($event)
@@ -10890,13 +10925,13 @@ var render = function() {
           }
         },
         model: {
-          value: _vm._$g(87, "v-model"),
+          value: _vm._$g(88, "v-model"),
           callback: function() {},
           expression: "submIt"
         }
       }),
       _c("u-modal", {
-        attrs: { _i: 88 },
+        attrs: { _i: 89 },
         on: {
           confirm: function($event) {
             return _vm.$handleViewEvent($event)
@@ -10906,7 +10941,7 @@ var render = function() {
           }
         },
         model: {
-          value: _vm._$g(88, "v-model"),
+          value: _vm._$g(89, "v-model"),
           callback: function() {},
           expression: "CheckStatus"
         }
@@ -12936,6 +12971,8 @@ try {
       .default,
     uInput: __webpack_require__(/*! @/uview-ui/components/u-input/u-input.vue */ 276).default,
     uSelect: __webpack_require__(/*! @/uview-ui/components/u-select/u-select.vue */ 284).default,
+    uCalendar: __webpack_require__(/*! @/uview-ui/components/u-calendar/u-calendar.vue */ 204)
+      .default,
     uUpload: __webpack_require__(/*! @/uview-ui/components/u-upload/u-upload.vue */ 292).default,
     uButton: __webpack_require__(/*! @/uview-ui/components/u-button/u-button.vue */ 155).default,
     uModal: __webpack_require__(/*! @/uview-ui/components/u-modal/u-modal.vue */ 308).default
@@ -13050,7 +13087,7 @@ var render = function() {
             "v-uni-view",
             { staticClass: _vm._$g(22, "sc"), attrs: { _i: 22 } },
             [
-              _c("v-uni-view", { attrs: { _i: 23 } }, [_vm._v("出库日期")]),
+              _c("v-uni-view", { attrs: { _i: 23 } }, [_vm._v("出库状态")]),
               _c("v-uni-view", { attrs: { _i: 24 } }, [
                 _vm._v(_vm._$g(24, "t0-0"))
               ])
@@ -13061,7 +13098,7 @@ var render = function() {
             "v-uni-view",
             { staticClass: _vm._$g(25, "sc"), attrs: { _i: 25 } },
             [
-              _c("v-uni-view", { attrs: { _i: 26 } }, [_vm._v("出库状态")]),
+              _c("v-uni-view", { attrs: { _i: 26 } }, [_vm._v("品名")]),
               _c("v-uni-view", { attrs: { _i: 27 } }, [
                 _vm._v(_vm._$g(27, "t0-0"))
               ])
@@ -13072,7 +13109,7 @@ var render = function() {
             "v-uni-view",
             { staticClass: _vm._$g(28, "sc"), attrs: { _i: 28 } },
             [
-              _c("v-uni-view", { attrs: { _i: 29 } }, [_vm._v("品名")]),
+              _c("v-uni-view", { attrs: { _i: 29 } }, [_vm._v("车号")]),
               _c("v-uni-view", { attrs: { _i: 30 } }, [
                 _vm._v(_vm._$g(30, "t0-0"))
               ])
@@ -13083,7 +13120,7 @@ var render = function() {
             "v-uni-view",
             { staticClass: _vm._$g(31, "sc"), attrs: { _i: 31 } },
             [
-              _c("v-uni-view", { attrs: { _i: 32 } }, [_vm._v("车号")]),
+              _c("v-uni-view", { attrs: { _i: 32 } }, [_vm._v("司机")]),
               _c("v-uni-view", { attrs: { _i: 33 } }, [
                 _vm._v(_vm._$g(33, "t0-0"))
               ])
@@ -13094,7 +13131,7 @@ var render = function() {
             "v-uni-view",
             { staticClass: _vm._$g(34, "sc"), attrs: { _i: 34 } },
             [
-              _c("v-uni-view", { attrs: { _i: 35 } }, [_vm._v("司机")]),
+              _c("v-uni-view", { attrs: { _i: 35 } }, [_vm._v("司机电话")]),
               _c("v-uni-view", { attrs: { _i: 36 } }, [
                 _vm._v(_vm._$g(36, "t0-0"))
               ])
@@ -13105,7 +13142,7 @@ var render = function() {
             "v-uni-view",
             { staticClass: _vm._$g(37, "sc"), attrs: { _i: 37 } },
             [
-              _c("v-uni-view", { attrs: { _i: 38 } }, [_vm._v("司机电话")]),
+              _c("v-uni-view", { attrs: { _i: 38 } }, [_vm._v("货物属性")]),
               _c("v-uni-view", { attrs: { _i: 39 } }, [
                 _vm._v(_vm._$g(39, "t0-0"))
               ])
@@ -13116,7 +13153,7 @@ var render = function() {
             "v-uni-view",
             { staticClass: _vm._$g(40, "sc"), attrs: { _i: 40 } },
             [
-              _c("v-uni-view", { attrs: { _i: 41 } }, [_vm._v("货物属性")]),
+              _c("v-uni-view", { attrs: { _i: 41 } }, [_vm._v("属性详情")]),
               _c("v-uni-view", { attrs: { _i: 42 } }, [
                 _vm._v(_vm._$g(42, "t0-0"))
               ])
@@ -13127,42 +13164,31 @@ var render = function() {
             "v-uni-view",
             { staticClass: _vm._$g(43, "sc"), attrs: { _i: 43 } },
             [
-              _c("v-uni-view", { attrs: { _i: 44 } }, [_vm._v("属性详情")]),
+              _c("v-uni-view", { attrs: { _i: 44 } }, [_vm._v("劳务公司")]),
               _c("v-uni-view", { attrs: { _i: 45 } }, [
                 _vm._v(_vm._$g(45, "t0-0"))
               ])
             ],
             1
-          ),
-          _c(
-            "v-uni-view",
-            { staticClass: _vm._$g(46, "sc"), attrs: { _i: 46 } },
-            [
-              _c("v-uni-view", { attrs: { _i: 47 } }, [_vm._v("劳务公司")]),
-              _c("v-uni-view", { attrs: { _i: 48 } }, [
-                _vm._v(_vm._$g(48, "t0-0"))
-              ])
-            ],
-            1
           )
         ],
         1
       ),
       _c(
         "v-uni-view",
-        { staticClass: _vm._$g(49, "sc"), attrs: { _i: 49 } },
+        { staticClass: _vm._$g(46, "sc"), attrs: { _i: 46 } },
         [
           _c(
             "v-uni-view",
-            { attrs: { _i: 50 } },
+            { attrs: { _i: 47 } },
             [
               _c("v-uni-view", {
-                staticClass: _vm._$g(51, "sc"),
-                attrs: { _i: 51 }
+                staticClass: _vm._$g(48, "sc"),
+                attrs: { _i: 48 }
               }),
               _c(
                 "v-uni-text",
-                { staticClass: _vm._$g(52, "sc"), attrs: { _i: 52 } },
+                { staticClass: _vm._$g(49, "sc"), attrs: { _i: 49 } },
                 [_vm._v("可编辑")]
               )
             ],
@@ -13170,8 +13196,34 @@ var render = function() {
           ),
           _c(
             "v-uni-view",
-            { staticClass: _vm._$g(53, "sc"), attrs: { _i: 53 } },
-            [_c("u-line", { attrs: { _i: 54 } })],
+            { staticClass: _vm._$g(50, "sc"), attrs: { _i: 50 } },
+            [_c("u-line", { attrs: { _i: 51 } })],
+            1
+          ),
+          _c(
+            "v-uni-view",
+            {
+              staticClass: _vm._$g(52, "sc"),
+              staticStyle: { margin: "0 auto", height: "55rpx" },
+              attrs: { _i: 52 }
+            },
+            [
+              _c(
+                "u-form-item",
+                { staticStyle: { width: "100%" }, attrs: { _i: 53 } },
+                [
+                  _c("u-input", {
+                    attrs: { _i: 54 },
+                    model: {
+                      value: _vm._$g(54, "v-model"),
+                      callback: function() {},
+                      expression: "form.fQty"
+                    }
+                  })
+                ],
+                1
+              )
+            ],
             1
           ),
           _c(
@@ -13191,7 +13243,7 @@ var render = function() {
                     model: {
                       value: _vm._$g(57, "v-model"),
                       callback: function() {},
-                      expression: "form.fQty"
+                      expression: "form.fGrossweight"
                     }
                   })
                 ],
@@ -13217,7 +13269,7 @@ var render = function() {
                     model: {
                       value: _vm._$g(60, "v-model"),
                       callback: function() {},
-                      expression: "form.fGrossweight"
+                      expression: "form.fNetweight"
                     }
                   })
                 ],
@@ -13238,12 +13290,30 @@ var render = function() {
                 "u-form-item",
                 { staticStyle: { width: "100%" }, attrs: { _i: 62 } },
                 [
-                  _c("u-input", {
+                  _c("u-select", {
                     attrs: { _i: 63 },
+                    on: {
+                      confirm: function($event) {
+                        return _vm.$handleViewEvent($event)
+                      }
+                    },
                     model: {
                       value: _vm._$g(63, "v-model"),
                       callback: function() {},
-                      expression: "form.fNetweight"
+                      expression: "formation"
+                    }
+                  }),
+                  _c("u-input", {
+                    attrs: { _i: 64 },
+                    on: {
+                      click: function($event) {
+                        return _vm.$handleViewEvent($event)
+                      }
+                    },
+                    model: {
+                      value: _vm._$g(64, "v-model"),
+                      callback: function() {},
+                      expression: "warehouseInformation"
                     }
                   })
                 ],
@@ -13255,39 +13325,39 @@ var render = function() {
           _c(
             "v-uni-view",
             {
-              staticClass: _vm._$g(64, "sc"),
+              staticClass: _vm._$g(65, "sc"),
               staticStyle: { margin: "0 auto", height: "55rpx" },
-              attrs: { _i: 64 }
+              attrs: { _i: 65 }
             },
             [
               _c(
                 "u-form-item",
-                { staticStyle: { width: "100%" }, attrs: { _i: 65 } },
+                { staticStyle: { width: "100%" }, attrs: { _i: 66 } },
                 [
-                  _c("u-select", {
-                    attrs: { _i: 66 },
+                  _c("u-calendar", {
+                    attrs: { _i: 67 },
                     on: {
-                      confirm: function($event) {
+                      change: function($event) {
                         return _vm.$handleViewEvent($event)
                       }
                     },
                     model: {
-                      value: _vm._$g(66, "v-model"),
+                      value: _vm._$g(67, "v-model"),
                       callback: function() {},
-                      expression: "formation"
+                      expression: "show_bsdate"
                     }
                   }),
                   _c("u-input", {
-                    attrs: { _i: 67 },
+                    attrs: { _i: 68 },
                     on: {
                       click: function($event) {
                         return _vm.$handleViewEvent($event)
                       }
                     },
                     model: {
-                      value: _vm._$g(67, "v-model"),
+                      value: _vm._$g(68, "v-model"),
                       callback: function() {},
-                      expression: "warehouseInformation"
+                      expression: "form.bsdate"
                     }
                   })
                 ],
@@ -13299,19 +13369,19 @@ var render = function() {
           _c(
             "v-uni-view",
             {
-              staticClass: _vm._$g(68, "sc"),
+              staticClass: _vm._$g(69, "sc"),
               staticStyle: { margin: "0 auto", height: "55rpx" },
-              attrs: { _i: 68 }
+              attrs: { _i: 69 }
             },
             [
               _c(
                 "u-form-item",
-                { staticStyle: { width: "100%" }, attrs: { _i: 69 } },
+                { staticStyle: { width: "100%" }, attrs: { _i: 70 } },
                 [
                   _c("u-input", {
-                    attrs: { _i: 70 },
+                    attrs: { _i: 71 },
                     model: {
-                      value: _vm._$g(70, "v-model"),
+                      value: _vm._$g(71, "v-model"),
                       callback: function() {},
                       expression: "form.fStevedore"
                     }
@@ -13325,19 +13395,19 @@ var render = function() {
           _c(
             "v-uni-view",
             {
-              staticClass: _vm._$g(71, "sc"),
+              staticClass: _vm._$g(72, "sc"),
               staticStyle: { margin: "0 auto" },
-              attrs: { _i: 71 }
+              attrs: { _i: 72 }
             },
             [
               _c(
                 "u-form-item",
-                { staticStyle: { width: "100%" }, attrs: { _i: 72 } },
+                { staticStyle: { width: "100%" }, attrs: { _i: 73 } },
                 [
                   _c("u-input", {
-                    attrs: { _i: 73 },
+                    attrs: { _i: 74 },
                     model: {
-                      value: _vm._$g(73, "v-model"),
+                      value: _vm._$g(74, "v-model"),
                       callback: function() {},
                       expression: "form.remark"
                     }
@@ -13351,33 +13421,33 @@ var render = function() {
         ],
         1
       ),
-      _vm._$g(74, "i")
+      _vm._$g(75, "i")
         ? _c(
             "v-uni-view",
             {
-              staticClass: _vm._$g(74, "sc"),
+              staticClass: _vm._$g(75, "sc"),
               staticStyle: { "margin-bottom": "60rpx" },
-              attrs: { _i: 74 }
+              attrs: { _i: 75 }
             },
             [
               _c(
                 "v-uni-view",
-                { attrs: { _i: 75 } },
+                { attrs: { _i: 76 } },
                 [
                   _c("v-uni-view", {
-                    staticClass: _vm._$g(76, "sc"),
-                    attrs: { _i: 76 }
+                    staticClass: _vm._$g(77, "sc"),
+                    attrs: { _i: 77 }
                   }),
                   _c(
                     "v-uni-text",
-                    { staticClass: _vm._$g(77, "sc"), attrs: { _i: 77 } },
+                    { staticClass: _vm._$g(78, "sc"), attrs: { _i: 78 } },
                     [_vm._v("附件上传")]
                   ),
                   _c(
                     "v-uni-view",
                     {
-                      staticClass: _vm._$g(78, "sc"),
-                      attrs: { _i: 78 },
+                      staticClass: _vm._$g(79, "sc"),
+                      attrs: { _i: 79 },
                       on: {
                         click: function($event) {
                           return _vm.$handleViewEvent($event)
@@ -13391,20 +13461,20 @@ var render = function() {
               ),
               _c(
                 "v-uni-view",
-                { staticClass: _vm._$g(79, "sc"), attrs: { _i: 79 } },
-                [_c("u-line", { attrs: { _i: 80 } })],
+                { staticClass: _vm._$g(80, "sc"), attrs: { _i: 80 } },
+                [_c("u-line", { attrs: { _i: 81 } })],
                 1
               ),
               _c(
                 "v-uni-view",
                 {
                   staticStyle: { width: "94%", margin: "0 auto" },
-                  attrs: { _i: 81 }
+                  attrs: { _i: 82 }
                 },
                 [
                   _c("u-upload", {
                     ref: "uUpload",
-                    attrs: { _i: 82 },
+                    attrs: { _i: 83 },
                     on: {
                       "on-remove": function($event) {
                         return _vm.$handleViewEvent($event)
@@ -13421,7 +13491,7 @@ var render = function() {
             1
           )
         : _vm._e(),
-      _c("br", { attrs: { _i: 83 } }),
+      _c("br", { attrs: { _i: 84 } }),
       _c(
         "v-uni-view",
         {
@@ -13433,14 +13503,14 @@ var render = function() {
             "padding-left": "20px",
             "padding-right": "20px"
           },
-          attrs: { _i: 84 }
+          attrs: { _i: 85 }
         },
         [
-          _vm._$g(85, "i")
+          _vm._$g(86, "i")
             ? _c(
                 "u-button",
                 {
-                  attrs: { _i: 85 },
+                  attrs: { _i: 86 },
                   on: {
                     click: function($event) {
                       return _vm.$handleViewEvent($event)
@@ -13449,11 +13519,11 @@ var render = function() {
                 },
                 [_vm._v("出库确认")]
               )
-            : _vm._$g(86, "e")
+            : _vm._$g(87, "e")
             ? _c(
                 "u-button",
                 {
-                  attrs: { _i: 86 },
+                  attrs: { _i: 87 },
                   on: {
                     click: function($event) {
                       return _vm.$handleViewEvent($event)
@@ -13467,7 +13537,7 @@ var render = function() {
         1
       ),
       _c("u-modal", {
-        attrs: { _i: 87 },
+        attrs: { _i: 88 },
         on: {
           confirm: function($event) {
             return _vm.$handleViewEvent($event)
@@ -13477,13 +13547,13 @@ var render = function() {
           }
         },
         model: {
-          value: _vm._$g(87, "v-model"),
+          value: _vm._$g(88, "v-model"),
           callback: function() {},
           expression: "submIt"
         }
       }),
       _c("u-modal", {
-        attrs: { _i: 88 },
+        attrs: { _i: 89 },
         on: {
           confirm: function($event) {
             return _vm.$handleViewEvent($event)
@@ -13493,7 +13563,7 @@ var render = function() {
           }
         },
         model: {
-          value: _vm._$g(88, "v-model"),
+          value: _vm._$g(89, "v-model"),
           callback: function() {},
           expression: "CheckStatus"
         }
@@ -19475,6 +19545,9 @@ var render = function() {
                     on: {
                       "on-success": function($event) {
                         return _vm.$handleViewEvent($event)
+                      },
+                      "on-remove": function($event) {
+                        return _vm.$handleViewEvent($event)
                       }
                     }
                   })