检斤管理

src/api/V2/houseSelfCollect/index.js

@@ -63,7 +63,7 @@ export const API_GET_CUSTOMER_GETBANK = '/driverViewInfo/bankShibie'
 //查询货名有未结算状态
 export const API_GET_INSPECT_GETCOUNT= '/qualityInspectionManagement/api/settledCount'
 //检斤打印查看
-export const API_GET_WEIGHTCHECK_GETPRINT= '/weighingManagement/api/getWeighingManagement'
+export const API_GET_WEIGHTCHECK_GETPRINT= '/weighingManagement/getWeighingManagement'
 //付款删除
 export const API_POST_PAYMENT_DEL = '/paymentManagement/api/deleteInfo'
 //付款审核

src/api/V2/outboundManagement/index.js

@@ -22,3 +22,5 @@ export const API_GET_INSPECT_GETBINNUMBER = '/warehouseBaseInfo/getWarehouse'
 export const API_POST_INSPECT_DELETEWEIGHING = '/weighingManagement/api/deleteWeightcheck'
 //合同编号下拉
 export const API_GET_INSPECT_CONTRANCLIST= '/warehouseBaseInfo/selectContractNoList'
+//检斤查看
+export const API_GET_WEIGHTCHECK = '/weighingManagement/getWeighingManagement'

src/model/outboundManagement/index.js

@@ -13,7 +13,8 @@ import {
     API_POST_INSPECT_DELETEWEIGHING,
     API_GET_INSPECT_CONTRANCLIST,
     API_POST_WEIGHTCHECK_ADDTARE,
-    API_POST_WEIGHTCHECK_EDITTAREOUT
+    API_POST_WEIGHTCHECK_EDITTAREOUT,
+    API_GET_WEIGHTCHECK
 
 }   from '@/api/V2/outboundManagement'
 
@@ -41,5 +42,6 @@ export const getbinNumber = appRx.get(API_GET_INSPECT_GETBINNUMBER, errorCatcher
 export const delelteWeighing = appRx.post(API_POST_INSPECT_DELETEWEIGHING, errorCatcher, errorHandle, filter)
 //合同编号下拉
 export const contractList = appRx.get(API_GET_INSPECT_CONTRANCLIST, errorCatcher, errorHandle, filter)
-
+//检斤查看
+export const getweighing = appRx.get(API_GET_WEIGHTCHECK, errorCatcher, errorHandle, filter)
   

src/views/contractManagement/purchaseContractEdit.vue

@@ -1285,25 +1285,6 @@ export default {
         })
         return
       }
-      if (
-        (!this.deptBudgetList.contractProcessInfo.goodsNameKey > 1000000000) ||
-          (this.deptBudgetList.contractProcessInfo.goodsNameKey < 100) ||
-        (String(this.deptBudgetList.contractProcessInfo.goodsNameKey).indexOf(
-          '.'
-        ) != -1 &&
-          String(this.deptBudgetList.contractProcessInfo.goodsNameKey).length -
-            (String(
-              this.deptBudgetList.contractProcessInfo.goodsNameKey
-            ).indexOf('.') +
-              1) >
-            2)
-      ) {
-        this.$message({
-          message: '合同收入金额输入错误',
-          type: 'warning',
-        })
-        return
-      }
       if (
         (this.deptBudgetList.contractProcessInfo.waterContent > 10000000) ||
           (this.deptBudgetList.contractProcessInfo.waterContent < 0) ||

src/views/outboundManagement/weighing.vue

@@ -1,444 +1,409 @@
 <template>
-  <div class="center">
-    <el-row>
-      <el-col :span="12">
-        <h2 class="bg-left titleup">{{ information }}检斤信息</h2>
-      </el-col>
-      <el-col :span="12" class="bg-right">
-        <el-button class="bg-bottom" type="primary" size="small" @click="cancel"
-          ><img
-            width="6"
-            height="10"
-            style="vertical-align: bottom; margin-right: 3px"
-            src="../../../public/img/lujing.png"
-            alt=""
-          />返回</el-button
-        >
-      </el-col>
-    </el-row>
-    <div class="substance">
-      <ws-form>
-        <div style="width: 50%; margin: 0 auto">
-          <div class="title">基本信息</div>
-          <ws-info-table>
-            <ws-form-item label="合同编号" span="1">
-              <ws-select
-                v-model="weighingList.contractNo"
-              @change="contractChange"
-                maxlength="100"
-                :disabled = "disabled1"
-                size="small"
-              >
-                <ws-option
-                  v-for="item in contractNoList"
-                  :key="item.contractNo"
-                  :label="item.contractNo"
-                  :value="item.contractNo"
-                />
-              </ws-select>
-            </ws-form-item>
-            <ws-form-item label="仓位号" span="1" prop="binNumber">
-              <ws-select
-                v-model="weighingList.binNumber"
-        
-                class="typeselect"
-                :disabled="disabled"
-              >
-                <ws-option
-                  v-for="item in getbinNumberList"
-                  :key="item.value"
-                  :label="item.value"
-                  :value="item.value"
-                />
-              </ws-select>
-            </ws-form-item>
-            <ws-form-item label="货名" span="1" prop="goodsName">
-              <ws-input
-                v-model="weighingList.goodsName"
-                placeholder="请输入货名"
-                maxlength="100"
-                 disabled 
-                size="small"
-              />
-            </ws-form-item>
-            <ws-form-item label="囤位号" span="1" prop="storageNumber">
-              <ws-input
-                v-model="weighingList.storageNumber"
-                placeholder="请输入囤位号"
-                maxlength="100"
-                size="small"
-                 :disabled = "disabled"
-              />
-            </ws-form-item>
-            <ws-form-item label="车牌号" span="1" prop="carNumber">
-              <ws-input
-                v-model="weighingList.carNumber"
-                placeholder="请输入车牌号"
-                maxlength="100"
-                size="small"
-                 :disabled = "disabled"
-              />
-            </ws-form-item>
-            <ws-form-item label="出库类型" span="1" prop="inOutType">
-              <ws-select
-                v-model="weighingList.inOutType"
-   
-                :disabled="disabled"
-              >
-                <ws-option
-                  v-for="item in inOutType"
-                  :key="item.value"
-                  :label="item.value"
-                  :value="item.value"
-                />
-              </ws-select>
-            </ws-form-item>
-            <ws-form-item label="毛重（公斤）" span="1" prop="grossWeight" v-if="this.types == 1">
-              <ws-input
-                v-model="weighingList.grossWeight"
-                @change="calculation"
-                placeholder="未获取到毛重"
-                maxlength="100"
-                size="small"
-                :disabled="disabled2"
-              />
-            </ws-form-item>
-            <el-button
-              type="primary"
-              v-if="this.types == 1"
-              
-              @click="chongxin"
-              >重新获取</el-button
-            >
+	<div class="center">
+		<el-row>
+			<el-col :span="12">
+				<h2 class="bg-left titleup">{{ information }}检斤信息</h2>
+			</el-col>
+			<el-col :span="12" class="bg-right">
+				<el-button class="bg-bottom" type="primary" size="small" @click="cancel"><img width="6" height="10"
+						style="vertical-align: bottom; margin-right: 3px" src="../../../public/img/lujing.png"
+						alt="" />返回</el-button>
+			</el-col>
+		</el-row>
+		<div class="substance">
+			<ws-form>
+				<div style="width: 50%; margin: 0 auto">
+					<div class="title">基本信息</div>
+					<ws-info-table>
+						<ws-form-item label="合同编号" span="1">
+							<ws-select v-model="weighingList.contractNo" @change="contractChange" maxlength="100"
+								:disabled="disabled1" size="small">
+								<ws-option v-for="item in contractNoList" :key="item.contractNo"
+									:label="item.contractNo" :value="item.contractNo" />
+							</ws-select>
+						</ws-form-item>
+						<ws-form-item label="仓位号" span="1" prop="binNumber">
+							<ws-select v-model="weighingList.binNumber" class="typeselect" :disabled="disabled">
+								<ws-option v-for="item in getbinNumberList" :key="item.value" :label="item.value"
+									:value="item.value" />
+							</ws-select>
+						</ws-form-item>
+						<ws-form-item label="货名" span="1" prop="goodsName">
+							<ws-input v-model="weighingList.goodsName" placeholder="请输入货名" maxlength="100" disabled
+								size="small" />
+						</ws-form-item>
+						<ws-form-item label="囤位号" span="1" prop="storageNumber">
+							<ws-input v-model="weighingList.storageNumber" placeholder="请输入囤位号" maxlength="100"
+								size="small" :disabled="disabled" />
+						</ws-form-item>
+						<ws-form-item label="车牌号" span="1" prop="carNumber">
+							<ws-input v-model="weighingList.carNumber" placeholder="请输入车牌号" maxlength="100" size="small"
+								:disabled="disabled" />
+						</ws-form-item>
+						<ws-form-item label="出库类型" span="1" prop="inOutType">
+							<ws-select v-model="weighingList.inOutType" :disabled="disabled">
+								<ws-option v-for="item in inOutType" :key="item.value" :label="item.value"
+									:value="item.value" />
+							</ws-select>
+						</ws-form-item>
+						<ws-form-item label="毛重（公斤）" span="1" prop="grossWeight" v-if="this.types == 1">
+							<ws-input v-model="weighingList.grossWeight" @input="calculation" placeholder="未获取到毛重"
+								maxlength="100" size="small" :disabled="disabled2" />
+						</ws-form-item>
+						<el-button type="primary" v-if="this.types == 1" @click="chongxin">重新获取</el-button>
 
-            <ws-form-item
-              label="皮重（公斤）"
-              span="1"
-              prop="tare"
-              
-            >
-              <ws-input
-                v-model="weighingList.tare"
-                placeholder="未获取到皮重"
-                maxlength="100"
-                size="small"
-                disabled
-              />
-            </ws-form-item>
+						<ws-form-item label="皮重（公斤）" span="1" prop="tare">
+							<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
-            >
-            <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"
-                  size="small"
-                  disabled
-                />
-              </ws-form-item>
-        </div>
-            <div class="bangdan">
-        <el-form-item label="上传磅单"  :label-width="formLabelWidth" 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"
-            v-if="this.types == 1"
-          >
-            <i class="el-icon-plus"></i>
-          </el-upload>
-          <el-dialog :visible.sync="dialogVisible">
-            <img width="100%" :src="collectionScreenshot" alt="" />
-          </el-dialog>
-            </div>
-          </ws-info-table>
-          <div class="but">
-            <el-button @click="cancel" type="primary">取消</el-button>
-            <el-button @click="print" type="primary" >保存</el-button>
-          </div>
-        </div>
-      </ws-form>
-    </div>
-  </div>
+						<el-button type="primary" v-if="this.types == 2 || this.types == 3">重新获取</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"
+									size="small" disabled />
+							</ws-form-item>
+						<!-- </div> -->
+						<div class="bangdan">
+							<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"
+								v-if="this.types == 1">
+								<i class="el-icon-plus"></i>
+							</el-upload>
+							<el-dialog :visible.sync="dialogVisible" v-if="this.types == 1">
+								<img width="100%" :src="weighingList.addressUrl" alt="" />
+							</el-dialog>
+						</div>
+					</ws-info-table>
+					<div class="but">
+						<el-button @click="cancel" type="primary">取消</el-button>
+						<el-button @click="print" type="primary">保存</el-button>
+					</div>
+				</div>
+			</ws-form>
+		</div>
+	</div>
 </template>
 <script>
-import { 
-  grossWeight, 
-  getbinNumber, 
-  contractList, 
-  tareAdd, 
-  tareEdit
-} from '@/model/outboundManagement/index'
-export default {
-  data() {
-    return {
-      inspect: {},
-      types: 3,
-      information: '添加皮重',
-      weighingList: {
-        carNumber:'',
-        storageNumber:'',
-        buckleMiscellaneous: 0,
-      },
-      disabled: false,
-      disabled1:false,
-      disabled2:false,
-      dialogVisible: false,
-      getbinNumberList: [],
-      contractNoList: [],
-      inOutType: [
-        { value: '销售出库', type: 1 },
-        { value: '移库出库', type: 3 },
-        { value: '暂存出库', type: 5 },
-        { value: '贸易服务出库', type: 7 },        
-      ],
-      relationId: '',
-      warehouseId: '',//仓库id
-      
-    }
-  },
-  activated() {
-    this.types = this.$route.query.typeNo
-    this.weighingList.number = this.$route.query.number
-    this.weighingList.binNumber = this.$route.query.binNumber
-    this.weighingList.storageNumber = this.$route.query.storageNumber
-    this.weighingList.carNumber = this.$route.query.carNumber
-    this.weighingList.goodsName = this.$route.query.goodsName
-    this.weighingList.inOutType = this.$route.query.inOutType
-    let id = this.$route.query.id
-    this.relationId = this.$route.query.relationId
-    this.warehouseId = this.$route.query.warehouseId
-    if (this.types == 1) {
-      this.information = '毛重'
-      this.disabled = true
-      this.disabled1 = true
-    } else if (this.types == 2) {
-      this.information = '编辑皮重'
-      this.disabled1 = true
-      this.disabled2=true
-    }
-    this.getList(id)
-  },
-  methods: {
-    chongxin() {
-      if (this.types == 2 || this.types == 3) {
-        return
-      }
-    },
-    handlePictureCardPreview1(file) {
-      this.collectionScreenshot = file.url
-    },
-    cancel() {
-      this.weighingList = {} 
-      this.$router.push({ path: 'weighingManagement' })
-    },
-    calculation() {
-      if ( this.weighingList.grossWeight  && this.weighingList.tare ) {
-        let  count = 0
-        this.weighingList.netWeight =this.weighingList.grossWeight -this.weighingList.tare-this.weighingList.buckleMiscellaneous
-      }
-    },
-    contractChange(e){
-      for(let i = 0 ; i < this.contractNoList.length ; i++){
-        if(e == this.contractNoList[i].contractNo){
-         this.weighingList.goodsName = this.contractNoList[i].goodsName
-        }
-      }
-    },
-    getList() {
-      // 仓位
-      getbinNumber({ id: this.warehouseId })
-        .toPromise()
-        .then((response) => {
-          this.getbinNumberList = []
-          for (let i = 0; i < response.warehousePositionInfoList.length; i++) {
-            this.getbinNumberList.push({
-              value: response.warehousePositionInfoList[i].binNumber,
-            })
-          }
-        })
-      //合同编号
-      contractList({ compId: sessionStorage.getItem('ws-pf_compId') })
-        .toPromise()
-        .then((response) => {
-          this.contractNoList = response
-        })
-    },
-    print() {
-      console.log(this.types,'dkshioyhado')
-      this.weighingList.secretaryWeigher = sessionStorage.getItem('ws-pf_staffName'),
-
-        this.$confirm('确定保存检斤信息？', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning',
-        })
-          .then(() => {
-            if (this.types == 1) {
-              this.weighingList.relationId = this.relationId
-              grossWeight(this.weighingList)
-                .toPromise()
-                .then((response) => {
-                  this.$notify.success({
-                    title: '成功',
-                    message: '提交成功',
-                  })
-                  this.$router.go(-1)
-                })
-                .catch((response) => {
-                  // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
-                })
-            } else if (this.types == 2) {
-              this.weighingList.warehouseId = this.warehouseId
-              tareEdit(this.weighingList)
-                .toPromise()
-                .then((response) => {
-                  this.$notify.success({
-                    title: '成功',
-                    message: '提交成功',
-                  })
-                  this.$router.go(-1)
-                })
-                .catch((response) => {
-                  // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
-                })
-            }else if (this.types == 3) {
-              this.weighingList.warehouseId = this.warehouseId
-              tareAdd(this.weighingList)
-                .toPromise()
-                .then((response) => {
-                  this.$notify.success({
-                    title: '成功',
-                    message: '提交成功',
-                  })
-                  this.$router.go(-1)
-                })
-                .catch((response) => {
-                  // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
-                })
-            }
-          })
-          .catch(() => {
-            return false
-          })
-    },
-  },
-}
+	import {
+		grossWeight,
+		getbinNumber,
+		contractList,
+		tareAdd,
+		tareEdit,
+		getweighing
+	} from '@/model/outboundManagement/index'
+	export default {
+		data() {
+			return {
+				inspect: {},
+				types: 3,
+				information: '添加皮重',
+				weighingList: {
+					carNumber: '',
+					storageNumber: '',
+					buckleMiscellaneous: 0,
+					compId: sessionStorage.getItem('ws-pf_compId'),
+				},
+				disabled: false,
+				disabled1: false,
+				disabled2: false,
+				dialogVisible: false,
+				getbinNumberList: [],
+				contractNoList: [],
+				inOutType: [{
+						value: '销售出库',
+						type: 1
+					},
+					{
+						value: '移库出库',
+						type: 3
+					},
+					{
+						value: '暂存出库',
+						type: 5
+					},
+					{
+						value: '贸易服务出库',
+						type: 7
+					},
+				],
+				relationId: '',
+				warehouseId: '', //仓库id
+			}
+		},
+		activated() {
+			this.types = this.$route.query.typeNo
+			this.weighingList.number = this.$route.query.number
+			this.weighingList.binNumber = this.$route.query.binNumber
+			this.weighingList.storageNumber = this.$route.query.storageNumber
+			this.weighingList.carNumber = this.$route.query.carNumber
+			this.weighingList.goodsName = this.$route.query.goodsName
+			this.weighingList.inOutType = this.$route.query.inOutType
+			let id = this.$route.query.id
+			this.relationId = this.$route.query.relationId
+			this.warehouseId = this.$route.query.warehouseId
+			if (this.types == 1) {
+				this.information = '毛重'
+				this.disabled = true
+				this.disabled1 = true
+			} else if (this.types == 2) {
+				this.information = '编辑皮重'
+				this.disabled1 = true
+				this.disabled2 = true
+			}
+			this.getList(id)
+		},
+		methods: {
+			chongxin() {
+				if (this.types == 2 || this.types == 3) {
+					return
+				}
+			},
+			handlePictureCardPreview1(file) {
+				this.weighingList.addressUrl = file.url
+			},
+			cancel() {
+				this.weighingList = {}
+				this.$router.push({
+					path: 'weighingManagement'
+				})
+			},
+			calculation() {
+				if (this.weighingList.grossWeight && this.weighingList.tare) {
+					let count = 0
+					this.weighingList.netWeight =
+						this.weighingList.grossWeight -
+						this.weighingList.tare
+				}
+			},
+			contractChange(e) {
+				for (let i = 0; i < this.contractNoList.length; i++) {
+					if (e == this.contractNoList[i].contractNo) {
+						this.weighingList.goodsName = this.contractNoList[i].goodsName
+						this.weighingList.contractPrice = this.contractNoList[i].contractPrice
+					}
+				}
+			},
+			getList() {
+				if (this.types == 2 || this.types == 1) {
+					getweighing({
+							id: this.$route.query.id
+						})
+						.toPromise()
+						.then((response) => {
+							this.weighingList = response
+						})
+				}
+				// 仓位
+				getbinNumber({
+						id: this.warehouseId
+					})
+					.toPromise()
+					.then((response) => {
+						this.getbinNumberList = []
+						for (let i = 0; i < response.warehousePositionInfoList.length; i++) {
+							this.getbinNumberList.push({
+								value: response.warehousePositionInfoList[i].binNumber,
+							})
+						}
+					})
+				//合同编号
+				contractList({
+						compId: sessionStorage.getItem('ws-pf_compId'),
+						flag: 5
+					})
+					.toPromise()
+					.then((response) => {
+						this.contractNoList = response
+					})
+			},
+			print() {
+				(this.weighingList.secretaryWeigher =
+					sessionStorage.getItem('ws-pf_staffName')),
+				this.$confirm('确定保存检斤信息？', '提示', {
+						confirmButtonText: '确定',
+						cancelButtonText: '取消',
+						type: 'warning',
+					})
+					.then(() => {
+						if (this.types == 1) {
+							this.weighingList.relationId = this.relationId
+							grossWeight(this.weighingList)
+								.toPromise()
+								.then((response) => {
+									this.$notify.success({
+										title: '成功',
+										message: '提交成功',
+									})
+									this.$router.push({
+										path: 'weighingManagement'
+									})
+								})
+								.catch((response) => {
+								})
+						} else if (this.types == 2) {
+							this.weighingList.warehouseId = this.warehouseId
+							tareEdit(this.weighingList)
+								.toPromise()
+								.then((response) => {
+									this.$notify.success({
+										title: '成功',
+										message: '提交成功',
+									})
+									this.$router.push({
+										path: 'weighingManagement'
+									})
+								})
+								.catch((response) => {
+								})
+						} else if (this.types == null) {
+							this.weighingList.warehouseId = this.warehouseId
+							tareAdd(this.weighingList)
+								.toPromise()
+								.then((response) => {
+									this.$notify.success({
+										title: '成功',
+										message: '提交成功',
+									})
+									this.$router.push({
+										path: 'weighingManagement'
+									})
+								})
+								.catch((response) => {
+								})
+						}
+					})
+					.catch(() => {
+						return false
+					})
+			},
+		},
+	}
 </script>
 <style lang="scss" scoped>
-.center {
-  background: #f6f7fc;
-}
-.ws-info-table {
-  border: none;
-}
-.ws-info-table .el-form-item {
-  width: 50%;
-  border: none;
-}
-.formItem {
-  width: 100%;
-  display: inline;
-}
-/deep/.ws-info-table .el-form-item .el-form-item__label {
-  width: 30%;
-  text-align: center;
-  background: #ffffff;
-  font-size: 14px;
-  color: #8890b1;
-}
-/deep/.ws-info-table .el-form-item .el-form-item__content {
-  border: none;
-}
-.title {
-  font-size: 16px;
-  font-weight: 600;
-  margin: 10px;
-}
-.titleup {
-  position: relative;
-}
-.title::before {
-  content: '';
-  display: inline-block;
-  width: 5px;
-  height: 15px;
-  background: #8890b1;
-  margin-right: 5px;
-}
+	.center {
+		background: #f6f7fc;
+	}
+
+	.ws-info-table {
+		border: none;
+	}
+
+	.ws-info-table .el-form-item {
+		width: 50%;
+		border: none;
+	}
+
+	.formItem {
+		width: 100%;
+		display: inline;
+	}
+
+	/deep/.ws-info-table .el-form-item .el-form-item__label {
+		width: 30%;
+		text-align: center;
+		background: #ffffff;
+		font-size: 14px;
+		color: #8890b1;
+	}
+
+	/deep/.ws-info-table .el-form-item .el-form-item__content {
+		border: none;
+	}
+
+	.title {
+		font-size: 16px;
+		font-weight: 600;
+		margin: 10px;
+	}
+
+	.titleup {
+		position: relative;
+	}
+
+	.title::before {
+		content: '';
+		display: inline-block;
+		width: 5px;
+		height: 15px;
+		background: #8890b1;
+		margin-right: 5px;
+	}
+
+	.substance {
+		background: #ffffff;
+		width: 100%;
+		border-radius: 4px;
+		margin: 0 auto;
+		padding-top: 20px;
+	}
+
+	/deep/.el-table .el-table__header .cell,
+	.el-table .el-table__body .cell {
+		text-align: center;
+	}
+
+	/deep/.el-table--enable-row-transition .el-table__body td {
+		text-align: center;
+	}
+
+	.bg-left {
+		padding-left: 30px;
+	}
+
+	.bg-right {
+		padding-right: 10px;
+		text-align: right;
+	}
+
+	.bg-bottom {
+		margin: 15px 0px;
+	}
+
+	.titleup {
+		position: relative;
+	}
+
+	/deep/ .substance .bangdan {
+		width: 100%;
+		padding-top: 6%;
+		padding-bottom: 6%;
+	}
+
+	// // .photo2{
+	// //   margin-top: 10px;
+	// // }
+	.el-upload--picture-card {
+		background-color: #fbfdff;
+		border: 1px dashed #c0ccda;
+		border-radius: 6px;
+		box-sizing: border-box;
+		width: 148px;
+		height: 148px;
+		line-height: 146px;
+		vertical-align: top;
+		margin-left: -289px;
+	}
+
+	.titleup::before {
+		content: '';
+		display: inline-block;
+		width: 5px;
+		height: 30px;
+		background: #5473e8;
+		position: absolute;
+		left: 0;
+	}
+
+	.but {
+		text-align: center;
+		margin: 20px auto;
+	}
 
-.substance {
-  background: #ffffff;
-  width: 100%;
-  border-radius: 4px;
-  margin: 0 auto;
-  padding-top: 20px;
-}
-/deep/.el-table .el-table__header .cell,
-.el-table .el-table__body .cell {
-  text-align: center;
-}
-/deep/.el-table--enable-row-transition .el-table__body td {
-  text-align: center;
-}
-.bg-left {
-  padding-left: 30px;
-}
-.bg-right {
-  padding-right: 10px;
-  text-align: right;
-}
-.bg-bottom {
-  margin: 15px 0px;
-}
-.titleup {
-  position: relative;
-}
-/deep/ .substance .bangdan {
-    width: 100%;
-    padding-top: 6%;
-    padding-bottom: 6%;
-}
-// // .photo2{
-// //   margin-top: 10px;
-// // }
-.el-upload--picture-card {
-    background-color: #fbfdff;
-    border: 1px dashed #c0ccda;
-    border-radius: 6px;
-    box-sizing: border-box;
-    width: 148px;
-    height: 148px;
-    line-height: 146px;
-    vertical-align: top;
-    margin-left: -289px;
-    }
-.titleup::before {
-  content: '';
-  display: inline-block;
-  width: 5px;
-  height: 30px;
-  background: #5473e8;
-  position: absolute;
-  left: 0;
-}
-.but {
-  text-align: center;
-  margin: 20px auto;
-}
-.butCss {
-  opacity: 0;
-}
-</style> 
+	.butCss {
+		opacity: 0;
+	}
+</style>

src/views/outboundManagement/weighingManagement.vue

@@ -1,249 +1,308 @@
 <!--检斤管理-->
 <template>
-  <div>
-    <BaseHeaderLayout :leftSpan="12">
-    <template slot="left">
-        <ws-button type="primary" @click="weighing(3)">添加</ws-button>
-      </template>
-      <!-- <template slot="left"> </template> -->
-      <template slot="right">
-        <ws-select
-          v-model="warehouseName"
-          placeholder=""
-          @change="warehouseNameChange"
-          :value="searchType"
-        >
-          <ws-option
-            v-for="item in warehouseList"
-            :key="item.value"
-            :label="item.value"
-            :value="item.value"
-            style="color: #8890b1"
-          />
-        </ws-select>
-        <div></div>
-        <ws-input
-          v-model="searchKeyWord"
-          placeholder="可按编号、客户名、车牌号查找"
-          clearable
-          maxlength="500"
-          type="input"
-        ></ws-input>
-        <ws-button class="find" type="primary" @click="find()"
-          ><img
-            width="16"
-            height="16"
-            style="
+	<div>
+		<BaseHeaderLayout :leftSpan="12">
+			<template slot="left">
+				<ws-button type="primary" @click="weighing(3)">添加</ws-button>
+			</template>
+			<!-- <template slot="left"> </template> -->
+			<template slot="right">
+				<ws-select v-model="warehouseName" placeholder="" @change="warehouseNameChange" :value="searchType">
+					<ws-option v-for="item in warehouseList" :key="item.value" :label="item.value" :value="item.value"
+						style="color: #8890b1" />
+				</ws-select>
+				<div></div>
+				<ws-input v-model="searchKeyWord" placeholder="可按合同编号、车牌号查找" clearable maxlength="500" type="input">
+				</ws-input>
+				<ws-button class="find" type="primary" @click="find()"><img width="16" height="16" style="
               vertical-align: text-top;
               position: relative;
               top: 0px;
               left: -8px;
-            "
-            src="../../../public/img/sousuo.png"
-            alt=""
-        /></ws-button>
-      </template>
-    </BaseHeaderLayout>
-    <el-table
-      :data="weighingList"
-      style="width: 100%; margin-top: 20px"
-      ref="weighingList"
-      border
-      height="780"
-    >
-      <el-table-column type="index" label="序号" width="50">
-        <template scope="scope">
-          <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
-          <span v-else>{{ scope.$index + 1 }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column prop="contractNo" width="120" label="合同编号"></el-table-column>
-      <el-table-column prop="goodsName" label="货名"></el-table-column>
-      <el-table-column prop="carNumber" label="车牌号"></el-table-column>
-      <el-table-column prop="grossWeight" label="毛重（公斤）"></el-table-column>
-      <el-table-column prop="tare" label="皮重（公斤）"></el-table-column>
-      <el-table-column prop="netWeight" label="净重（公斤）"></el-table-column>
-      <el-table-column prop="binNumber" label="仓位号"></el-table-column>
-      <el-table-column prop="storageNumber" label="囤位号"></el-table-column>
-      <el-table-column prop="secretaryWeigher" label="司称员"></el-table-column>
-      <el-table-column prop="suqualityTestingDate" label="称重时间"></el-table-column>
-      <el-table-column prop="address" label="附件"></el-table-column>
-      <el-table-column prop="status" label="状态"></el-table-column>
-      <el-table-column width="300" prop="contractNo1" label="操作">
-        <template slot-scope="scope">
-        <el-button @click="weighing(scope.row,1)" v-if="scope.row.status !='已质检'">毛重</el-button>
-        <el-button @click="weighing(scope.row,2)" v-if="scope.row.status =='已称皮重'">皮重</el-button>
-        <el-button @click="del(scope.row)" v-if="scope.row.status =='已称皮重'">删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <div style="text-align: center">
-      <el-pagination
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-        :current-page="currentPage"
-        :page-size="deptCircularPage.pageSize"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="deptBudgetTotal"
-      >
-      </el-pagination>
-    </div>
-  </div>
+            " src="../../../public/img/sousuo.png" alt="" /></ws-button>
+			</template>
+		</BaseHeaderLayout>
+		<el-table :data="weighingList" style="width: 100%; margin-top: 20px" ref="weighingList" border height="780">
+			<el-table-column type="index" label="序号" width="50">
+				<template scope="scope">
+					<span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
+					<span v-else>{{ scope.$index + 1 }}</span>
+				</template>
+			</el-table-column>
+			<el-table-column prop="contractNo" width="120" label="合同编号"></el-table-column>
+			<el-table-column prop="goodsName" label="货名"></el-table-column>
+			<el-table-column prop="carNumber" label="车牌号"></el-table-column>
+			<el-table-column prop="grossWeight" label="毛重（公斤）"></el-table-column>
+			<el-table-column prop="tare" label="皮重（公斤）"></el-table-column>
+			<el-table-column prop="netWeight" label="净重（公斤）"></el-table-column>
+			<el-table-column prop="binNumber" label="仓位号"></el-table-column>
+			<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">
+            		{{scope.row.tareDate}}
+          		</span>
+        	</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
+            }}
+					</span>
+				</template>
+			</el-table-column>
+			<el-table-column prop="status" label="状态"></el-table-column>
+			<el-table-column width="300" prop="contractNo1" label="操作">
+				<template slot-scope="scope">
+					<el-button @click="weighing(scope.row, 1)" v-if="scope.row.status != '已质检'">毛重</el-button>
+					<el-button @click="weighing(scope.row, 2)" v-if="scope.row.status == '已称皮重'">皮重</el-button>
+					<el-button @click="del(scope.row)" v-if="scope.row.status == '已称皮重'">删除</el-button>
+				</template>
+			</el-table-column>
+		</el-table>
+		<div style="text-align: center">
+			<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+				:current-page="currentPage" :page-size="deptCircularPage.pageSize"
+				layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal">
+			</el-pagination>
+		</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" />
+		</WinseaContentModal>
+	</div>
 </template>
 <script>
-import { getweighingList, selectWarehouseSelf, delelteWeighing,  } from '@/model/outboundManagement/index'
+	import {
+		getweighingList,
+		selectWarehouseSelf,
+		delelteWeighing,
+	} from '@/model/outboundManagement/index'
+	import {
+		EventBus
+	} from 'base-core-lib'
+	import WsUpload from '@/components/WsUpload'
+	export default {
 
-export default {
-  data() {
-    return {
-      //分页
-      currentPage: 1,
-      pageSize: 10,
-      deptCircularPage: {},
-      deptBudgetTotal: 0,
-      paymentForm: false,
-      paymentForm1: false,
-      weighingList: [],
-      searchKeyWord: '',
-      searchType: [],
-      warehouseName: '',
-      value1: '', //选择时间
-      warehouseList: [],
-      warehouseId:'',
-    }
-  },
-  activated() {
-    this.getList()
-  },
-  methods: {
-    warehouseNameChange(e) {
-      // this.warehouseName = e
-      console.log(this.warehouseList )
-      for(let i = 0 ; i < this.warehouseList.length ; i++){
-        if(this.warehouseList[i].value == e){
-          this.warehouseId = this.warehouseList[i].warehouseId
-        }
+		components: {
+			WsUpload,
+		},
+		data() {
+			return {
+				//分页
+				dialogViewSpareMoney: false,
+				currentPage: 1,
+				pageSize: 10,
+				deptCircularPage: {},
+				deptBudgetTotal: 0,
+				paymentForm: false,
+				paymentForm1: false,
+				weighingList: [],
+				searchKeyWord: '',
+				searchType: [],
+				warehouseName: '',
+				value1: '', //选择时间
+				warehouseList: [],
+				warehouseId: '',
+				accessoryTFs: false,
+				appendixIdss: [],
+				compId: sessionStorage.getItem('ws-pf_compId'),
+			}
+		},
+		activated() {
+			this.selectWarehouse()
+			this.showType = this.isShow
+		},
+		methods: {
+			warehouseNameChange(e) {
+				// this.warehouseName = e
+				console.log(this.warehouseList)
+				for (let i = 0; i < this.warehouseList.length; i++) {
+					if (this.warehouseList[i].value == e) {
+						this.warehouseId = this.warehouseList[i].warehouseId
+					}
+				}
+			},
+			weighing(row, num) {
+				console.log
+				this.$router.push({
+					path: 'weighing',
+					query: {
+						typeNo: num,
+						id: row.id,
+						number: row.number,
+						binNumber: row.binNumber,
+						customer: row.customer,
+						storageNumber: row.storageNumber,
+						carNumber: row.carNumber,
+						goodsName: row.goodsName,
+						grossWeight: row.grossWeight,
+						tare: row.tare,
+						netWeight: row.netWeight,
+						relationId: row.relationId,
+						warehouseId: this.warehouseId,
+					},
+				})
+			},
+			// Reacquire() {
+			//   //重新获取
+			// },
+			find() {
+				this.getList()
+			},
+			handleSizeChange(val) {
+				console.log(`每页 ${val} 条`)
+				this.pageSize = val
+				this.getList()
+			},
+			handleCurrentChange(val) {
+				this.currentPage = val
+				console.log(`当前页: ${val}`)
+				this.getList()
+			},
+			del(row) {
+				this.$confirm(`检斤信息删除后不可恢复，是否确定删除？`, {
+						cancelButtonText: '取消',
+						confirmButtonText: '确定',
+						type: 'warning',
+					})
+					.then(() => {
+						delelteWeighing({
+								id: row.id
+							})
+							.toPromise()
+							.then((response) => {
+								this.$notify.success({
+									title: '成功',
+									message: '删除成功',
+								})
+								this.getList()
+							})
+							.catch((response) => {})
+					})
+					.catch(() => {
+						return false
+					})
+			},
+			selectWarehouse() {
+				selectWarehouseSelf({
+						compId: sessionStorage.getItem('ws-pf_compId'),
+						personCharge: sessionStorage.getItem('ws-pf_staffName'),
+					})
+					.toPromise()
+					.then((response) => {
+						this.warehouseList = []
+						for (let i = 0; i < response.length; i++) {
+							this.warehouseList.push({
+								value: response[i].warehouseName,
+								warehouseId: response[i].id,
+							})
+						}
+						this.warehouseName = this.warehouseList[0].value
+						this.warehouseId = this.warehouseList[0].warehouseId
+						this.purchasePriceList = this.warehouseList[0].warehouseList
+						this.getList()
+					})
+			},
+			getList() {
+				getweighingList({
+						compId: sessionStorage.getItem('ws-pf_compId'),
+						currentPage: this.currentPage,
+						pageSize: this.pageSize,
+						searchKeyWord: this.searchKeyWord,
+						warehouseName: this.warehouseName,
+						managementType: 3,
+					})
+					.toPromise()
+					.then((response) => {
+						this.weighingList = response.records
+						this.deptBudgetTotal = response.total
+						for (var i = 0; i < response.records.length; i++) {
+							if (response.records[i].addressUrl != null) {
+								if (response.records[i].addressUrl) {
+									response.records[i].addressUrlArray = response.records[i].addressUrl.split(',')
+								}
+							} else {
+								response.records[i].addressUrlArray = []
+							}
+						}
+						for (var i = 0; i < response.records.length; i++) {
+							var arr = new Array() 
+							this.addressUrls[i] = new Array() 
+							if (this.weighingList.records[i].addressUrl !=
+								null) {
+								arr = this.weighingList.records[i].addressUrl.split(',') 
+								this.addressUrls[i] = arr
+							}
+						}
+					})
+					.catch((response) => {
 
-      }
-    },
-    weighing(row,num) {
-      console.log
-      this.$router.push({
-        path: 'weighing',
-        query: { typeNo: num ,id:row.id,number:row.number,binNumber:row.binNumber,customer:row.customer,storageNumber:row.storageNumber,carNumber:row.carNumber,goodsName:row.goodsName,grossWeight:row.grossWeight,tare:row.tare,netWeight:row.netWeight,relationId:row.relationId,warehouseId:this.warehouseId},
-      })
-    },
-    // Reacquire() {
-    //   //重新获取
-    // },
-    find(){
-      this.getList()
-
-    },
-    handleSizeChange(val) {
-      console.log(`每页 ${val} 条`)
-      this.pageSize = val
-      this.getList()
-    },
-    handleCurrentChange(val) {
-      this.currentPage = val
-      console.log(`当前页: ${val}`)
-      this.getList()
-    },
-    del(row){
-      this.$confirm(`检斤信息删除后不可恢复，是否确定删除？`, {
-        cancelButtonText: '取消',
-        confirmButtonText: '确定',
-        type: 'warning',
-      })
-        .then(() => {
-          delelteWeighing({ id: row.id })
-            .toPromise()
-            .then((response) => {
-              this.$notify.success({
-                title: '成功',
-                message: '删除成功',
-              })
-              this.getList()
-            })
-            .catch((response) => {
-            })
-        })
-        .catch(() => {
-          return false
-        })
-    },
-    getList() {
-      selectWarehouseSelf({
-        compId: sessionStorage.getItem('ws-pf_compId'),
-        personCharge: sessionStorage.getItem('ws-pf_staffName'),
-      })
-        .toPromise()
-        .then((response) => {
-          this.warehouseList = []
-          for (let i = 0; i < response.length; i++) {
-            this.warehouseList.push({
-              value: response[i].warehouseName,
-              warehouseId :response[i].id
-            })
-          }
-          this.warehouseName =  this.warehouseList[0].value
-          this.warehouseId = this.warehouseList[0].warehouseId
-        })
-      getweighingList({
-        compId: sessionStorage.getItem('ws-pf_compId'),
-        currentPage: this.currentPage,
-        pageSize: this.pageSize,
-        searchKeyWord: this.searchKeyWord,
-        warehouseName: this.warehouseName,
-      })
-        .toPromise()
-        .then((response) => {
-          // this.$notify.success({
-          //   title: '成功',
-          //   message: '删除成功',
-          // })
-          this.weighingList = response.records 
-          this.deptBudgetTotal = response.total
-          
-        })
-        .catch((response) => {
-          // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
-        })
-    },
-  },
-}
+					})
+			},
+			//附件
+			fujian(row) {
+				if (row.addressUrl === null || row.addressUrl === '') {
+					EventBus.$emit(
+						'warning',
+						this.$t('system.noticeCircular.NoInformation')
+					)
+				} else {
+					this.accessoryTFs = true
+				}
+				this.appendixIdss = row.addressUrl
+			},
+			handleClose() {
+				this.dialogViewSpareMoney = false
+			},
+		},
+	}
 </script>
 <style lang="scss" scoped>
-.title {
-  font-size: 20px;
-  font-weight: 600;
-  margin: 20px;
-}
-.ws-info-table {
-  border: none;
-}
-.ws-info-table .el-form-item {
-  width: 50%;
-  border: none;
-}
-/deep/.ws-info-table .el-form-item .el-form-item__label {
-  width: 30%;
-  text-align: center;
-  background: #ffffff;
-  color: #8890b1;
-}
-/deep/.ws-info-table .el-form-item .el-form-item__content {
-  border: none;
-}
-/deep/.el-table .el-table__header .cell,
-.el-table .el-table__body .cell {
-  text-align: center;
-}
-/deep/.el-table--enable-row-transition .el-table__body td {
-  text-align: center;
-}
-.formItem {
-  width: 51% !important;
-}
+	.title {
+		font-size: 20px;
+		font-weight: 600;
+		margin: 20px;
+	}
+
+	.ws-info-table {
+		border: none;
+	}
+
+	.ws-info-table .el-form-item {
+		width: 50%;
+		border: none;
+	}
+
+	/deep/.ws-info-table .el-form-item .el-form-item__label {
+		width: 30%;
+		text-align: center;
+		background: #ffffff;
+		color: #8890b1;
+	}
+
+	/deep/.ws-info-table .el-form-item .el-form-item__content {
+		border: none;
+	}
+
+	/deep/.el-table .el-table__header .cell,
+	.el-table .el-table__body .cell {
+		text-align: center;
+	}
+
+	/deep/.el-table--enable-row-transition .el-table__body td {
+		text-align: center;
+	}
+
+	.formItem {
+		width: 51% !important;
+	}
 </style>

src/views/platformaudit/grainmerchantreview.vue

@@ -557,7 +557,6 @@ export default {
       this.getList()
     },
     fujian(row) {
-      console.log(row)
       if(row.customerTypeFlag==2){
         this.accessoryimages.businessLicenseAddressUrl=row.businessLicenseAddressUrl
       }