Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pc

src/views/contractManagement/purchaseContract.vue

@@ -430,9 +430,6 @@ export default {
     handleClose() {
       this.dialogViewSpareMoney = false
     },
-    handleClose1() {
-      this.accesscard = false
-    },
     handleSizeChange(val) {
       console.log(`每页 ${val} 条`)
       this.pageSize = val
@@ -558,9 +555,6 @@ export default {
       })
     },
     // 关闭 dialog时 处理文件url 初始化upload组件
-    handleCloe() {
-      this.dialogViewSpareMoney = false
-    },
     history(row) {
       console.log(row)
       billoperatehis({ id: row.id })

src/views/outboundManagement/weighing.vue

@@ -56,8 +56,7 @@
 							<ws-input v-model="weighingList.tare" placeholder="未获取到皮重" maxlength="100" size="small"
 								disabled />
 						</ws-form-item>
-
-						<el-button type="primary" v-if="this.types == 2 || this.types == 3">重新获取</el-button>
+						<el-button type="primary" v-if="this.types == 2 || this.types == null">重新获取</el-button>
 						<!-- <div class="formItem"> -->
 							<ws-form-item label="净重（公斤）" span="1" prop="netWeight" v-if="this.types == 1">
 								<ws-input v-model="weighingList.netWeight" placeholder="请输入净重" maxlength="100"
@@ -68,7 +67,7 @@
 							<el-form-item label="上传磅单" v-if="this.types == 1">
 							</el-form-item>
 							<el-upload action="https://www.zthymaoyi.com/upload/admin" list-type="picture-card"
-								:on-success="handlePictureCardPreview1" :on-remove="handleRemove" class="photo2"
+								:on-success="(res, file) => {handlePictureCardPreview1(res)}" :on-remove="(value) => {handleRemove(value)}" class="photo2"
 								v-if="this.types == 1">
 								<i class="el-icon-plus"></i>
 							</el-upload>
@@ -106,6 +105,7 @@
 					storageNumber: '',
 					buckleMiscellaneous: 0,
 					compId: sessionStorage.getItem('ws-pf_compId'),
+					warehouseName: '',
 				},
 				disabled: false,
 				disabled1: false,
@@ -163,7 +163,8 @@
 				}
 			},
 			handlePictureCardPreview1(file) {
-				this.weighingList.addressUrl = file.url
+				this.weighingList.addressUrl += file.url + ','
+				this.addressUrls.push(file.url)
 			},
 			cancel() {
 				this.weighingList = {}
@@ -261,7 +262,7 @@
 								})
 						} else if (this.types == null) {
 							this.weighingList.warehouseId = this.warehouseId
-							tareAdd(this.weighingList)
+							tareAdd(this.weighingList,this.warehouseName)
 								.toPromise()
 								.then((response) => {
 									this.$notify.success({

src/views/outboundManagement/weighingManagement.vue

@@ -39,22 +39,19 @@
 			<el-table-column prop="storageNumber" label="囤位号"></el-table-column>
 			<el-table-column prop="secretaryWeigher" label="司称员"></el-table-column>
 			<el-table-column prop="grossDate" label="称重时间">
-				<!-- <template slot-scope="scope">
-          		<span v-if="scope.row.grossDate == null">
+				<template slot-scope="scope">
+				{{scope.row.grossDate}}
+				<span v-if="scope.row.grossDate == null">
             		{{scope.row.tareDate}}
           		</span>
-        	</template> -->
+				</template>
 			</el-table-column>
 			<el-table-column prop="addressUrl" label="附件">
 				<template slot-scope="scope">
 					<img width="18" height="20" style="vertical-align: text-top; position: relative; top: -1px"
 						src="../../../public/img/fujian.png" @click="fujian(scope.row)" alt="" />
 					<span v-if="scope.row.addressUrlArray != null">
-						{{
-              scope.row.addressUrlArray.length == 0
-                ? ''
-                : scope.row.addressUrlArray.length
-            }}
+						{{scope.row.addressUrlArray.length == 0? '': scope.row.addressUrlArray.length}}
 					</span>
 				</template>
 			</el-table-column>
@@ -75,8 +72,10 @@
 		</div>
 		<WinseaContentModal v-model="accessoryTFs" :title="$t('system.noticeCircular.information')"
 			@on-cancel="handleClose">
-			<ws-upload ref="upload" :comp-id="compId" :appendix-ids="appendixIdss" :editable="false"
-				accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
+			<p>查看附件</p>
+			<div style="display: inline-block; margin: 5px" v-for="item in appendixIdss">
+				<img width="100" height="100" :src="item" alt="" />
+			</div>
 		</WinseaContentModal>
 	</div>
 </template>
@@ -91,7 +90,6 @@
 	} from 'base-core-lib'
 	import WsUpload from '@/components/WsUpload'
 	export default {
-
 		components: {
 			WsUpload,
 		},
@@ -114,6 +112,7 @@
 				warehouseId: '',
 				accessoryTFs: false,
 				appendixIdss: [],
+				addressUrls: [],
 				compId: sessionStorage.getItem('ws-pf_compId'),
 			}
 		},
@@ -235,11 +234,11 @@
 							}
 						}
 						for (var i = 0; i < response.records.length; i++) {
-							var arr = new Array() 
-							this.addressUrls[i] = new Array() 
+							var arr = new Array()
+							this.addressUrls[i] = new Array()
 							if (this.weighingList.records[i].addressUrl !=
 								null) {
-								arr = this.weighingList.records[i].addressUrl.split(',') 
+								arr = this.weighingList.records[i].addressUrl.split(',')
 								this.addressUrls[i] = arr
 							}
 						}
@@ -258,7 +257,7 @@
 				} else {
 					this.accessoryTFs = true
 				}
-				this.appendixIdss = row.addressUrl
+				this.appendixIdss = row.addressUrlArray
 			},
 			handleClose() {
 				this.dialogViewSpareMoney = false