gjy 3 years ago
parent
commit
87d6dff786

+ 257 - 5
src/views/tradeServicesManagement/approveWarehouseReceipt.vue

@@ -1,26 +1,278 @@
 // 审批仓单
 <template>
 	<div>
-		
+		 <el-form
+      ref="deptBudgetList"
+      :rules="mainReportAdd"
+      :model="deptBudgetList"
+    >
+      <!-- <ws-info-table class="el-table"> -->
+		  <div>申请信息</div>
+        <el-form-item label="业务编号" span="1" prop="taskNo" class="forlist">
+          <el-input
+            v-model="deptBudgetList.taskNo"
+            placeholder="请输入任务编号"
+            maxlength="20"
+            size="small"
+            disabled
+          ></el-input>
+        </el-form-item>
+		<el-form-item label="名头" span="1" prop="taskNo" class="forlist">
+		  	<el-select v-model="deptBudgetList.region" placeholder="请选择名头">
+				<el-option label="区域一" value="shanghai"></el-option>
+				<el-option label="区域二" value="beijing"></el-option>
+			</el-select>
+        </el-form-item>
+		<el-form-item label="仓库名称" span="1" prop="taskNo" class="forlist">
+         	<el-select v-model="deptBudgetList.region" placeholder="请选择仓库">
+				<el-option label="区域一" value="shanghai"></el-option>
+				<el-option label="区域二" value="beijing"></el-option>
+			</el-select>
+        </el-form-item>
+		<el-form-item label="仓位号" span="1" prop="taskNo" class="forlist">
+         	<el-select disabled v-model="deptBudgetList.region" placeholder="请选择仓位号">
+				<el-option label="区域一" value="shanghai"></el-option>
+				<el-option label="区域二" value="beijing"></el-option>
+			</el-select>
+        </el-form-item>
+		<el-form-item label="仓库地址" span="1" prop="taskNo" class="forlist">
+         	<el-input
+            disabled
+            v-model="deptBudgetList.goodsName"
+            placeholder="请输入仓库地址"
+            size="small"
+          ></el-input>
+        </el-form-item>
+        <el-form-item prop="goodsName" label="货名" span="1">
+            <el-select disabled v-model="deptBudgetList.region" placeholder="请选择货名">
+				<el-option label="区域一" value="shanghai"></el-option>
+				<el-option label="区域二" value="beijing"></el-option>
+			</el-select>
+        </el-form-item>
+		<el-form-item prop="goodsName" label="货名" span="1">
+            <el-select disabled v-model="deptBudgetList.region" placeholder="请选择货名">
+				<el-option label="区域一" value="shanghai"></el-option>
+				<el-option label="区域二" value="beijing"></el-option>
+			</el-select>
+        </el-form-item>
+		<el-form-item prop="goodsName" label="品级" span="1">
+            <el-select disabled v-model="deptBudgetList.region" placeholder="请选择品级">
+				<el-option label="区域一" value="shanghai"></el-option>
+				<el-option label="区域二" value="beijing"></el-option>
+			</el-select>
+        </el-form-item>
+		<el-form-item label="现有储量" span="1" prop="taskNo" class="forlist">
+         	<el-input
+            disabled
+            v-model="deptBudgetList.goodsName"
+            placeholder="请输入现有储量"
+            size="small"
+          ></el-input>
+        </el-form-item>
+		<el-form-item label="可用储量(吨)" span="1" prop="taskNo" class="forlist">
+         	<el-input
+            disabled
+            v-model="deptBudgetList.goodsName"
+            placeholder="请输入可用储量"
+            size="small"
+          ></el-input>
+        </el-form-item>
+		<el-form-item label="本单重量(吨)" span="1" prop="taskNo" class="forlist">
+         	<el-input
+            v-model="deptBudgetList.goodsName"
+            placeholder="输入本次仓单申请所需的重量"
+            size="small"
+          ></el-input>
+        </el-form-item>
+		<el-form-item label="单价(元/吨)" span="1" prop="taskNo" class="forlist">
+         	<el-input
+            v-model="deptBudgetList.goodsName"
+            placeholder="输入粮食单价"
+            size="small"
+          ></el-input>
+        </el-form-item>
+		<el-form-item label="总价值(元)" span="1" prop="taskNo" class="forlist">
+         	<el-input
+            v-model="deptBudgetList.goodsName"
+            placeholder="自动计算,不可编辑"
+            size="small"
+          ></el-input>
+        </el-form-item>
+		<el-form-item label="申请比例(%)" span="1" prop="taskNo" class="forlist">
+         	<el-input
+            v-model="deptBudgetList.goodsName"
+            placeholder="输入申请比例"
+            size="small"
+          ></el-input>
+        </el-form-item>
+		<el-form-item label="申请金额(元)" span="1" prop="taskNo" class="forlist">
+         	<el-input
+            v-model="deptBudgetList.goodsName"
+            placeholder="输入申请金额"
+            size="small"
+          ></el-input>
+        </el-form-item>
+		<div>发放信息</div>
+		<el-form-item label="合同编号" span="1" prop="taskNo" class="forlist">
+         	<el-input
+            v-model="deptBudgetList.goodsName"
+            placeholder="输入合同编号"
+            size="small"
+          ></el-input>
+        </el-form-item>
+		<el-form-item label="发放金额(元)" span="1" prop="taskNo" class="forlist">
+         	<el-input
+            v-model="deptBudgetList.goodsName"
+            placeholder="输入发放金额"
+            size="small"
+          ></el-input>
+        </el-form-item>
+		<el-form-item label="利息" span="1" prop="taskNo" class="forlist">
+         	<el-input
+            v-model="deptBudgetList.goodsName"
+            placeholder="输入金额"
+            size="small"
+          ></el-input>
+        </el-form-item>
+		<el-form-item label="监管费(元)" span="1" prop="taskNo" class="forlist">
+         	<el-input
+            v-model="deptBudgetList.goodsName"
+            placeholder="输入金额"
+            size="small"
+          ></el-input>
+        </el-form-item>
+		<el-form-item label="保险费" span="1" prop="taskNo" class="forlist">
+         	<el-input
+            v-model="deptBudgetList.goodsName"
+            placeholder="输入金额"
+            size="small"
+          ></el-input>
+        </el-form-item>
+		<el-form-item label="其他费用(元)" span="1" prop="taskNo" class="forlist">
+         	<el-input
+            v-model="deptBudgetList.goodsName"
+            placeholder="输入金额"
+            size="small"
+          ></el-input>
+        </el-form-item>
+		<el-form-item label="合计应还(元)" span="1" prop="taskNo" class="forlist">
+         	<el-input
+            v-model="deptBudgetList.goodsName"
+            placeholder="自动计算,不可编辑"
+            size="small"
+          ></el-input>
+        </el-form-item>
+		<div>附件</div>
+		<ws-upload
+        ref="upload"
+        :comp-id="compId"
+        :appendix-ids="deptBudgetList.addressUrl"
+        :size-limit="size"
+        @onChange="onChange"
+        accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
+      />
+	  <div>外审部门</div>
+	  	<el-form-item prop="goodsName" label="银行" span="1">
+            <el-select v-model="deptBudgetList.region" placeholder="请选择银行">
+				<el-option label="区域一" value="shanghai"></el-option>
+				<el-option label="区域二" value="beijing"></el-option>
+			</el-select>
+        </el-form-item>
+		<el-form-item label="第三方" span="1" prop="taskNo" class="forlist">
+         	<el-input
+            v-model="deptBudgetList.goodsName"
+            placeholder="无"
+            size="small"
+          ></el-input>
+        </el-form-item>
+		<div>
+			 <el-button @click='reject' type="primary">驳回</el-button>
+			  <el-button @click='pass'  type="primary">通过</el-button>
+		</div>
+		<div>审核记录</div>
+		 <el-table
+        class="wenzi"
+        :data="taskhistories"
+        style="width: 100%"
+      >
+        <el-table-column prop="operatorMajorRoleName" label="审核人">
+          <template scope="scope">
+            {{scope.row.operatorMajorRoleName}}{{scope.row.operatorName}}
+            </template>
+        </el-table-column>
+        <el-table-column prop="inOutTaskNo" label="审核结果">
+          <template scope="scope">
+            <span v-if='scope.row.approved'>通过</span>
+            <span v-if='!scope.row.approved'>驳回</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="endTime" label="审核时间"></el-table-column>
+        <el-table-column prop="auditMind" label="审核意见"></el-table-column>
+     </el-table>
+      <!-- </ws-info-table> -->
+		 </el-form>
+		 <el-dialog :visible.sync="isShowadjustment" :title="title">
+			<div>
+				<textarea placeholder="输入审核原因" name="" id="" cols="30" rows="10"></textarea>
+			</div>
+			<div>
+			 <el-button v-if='status==0' @click='' type="primary">确认驳回</el-button>
+			  <el-button v-if='status==1' @click='submit'  type="primary">确定通过</el-button>
+		</div>
+		</el-dialog>
 	</div>
 </template>
 <script>
 	import {
 		getList,
-	
 	} from '@/model/tradeServicesManagement/index'
+	import WsUpload from '@/components/WsUpload'
 	export default {
-		components: {},
+		components: {
+			WsUpload,
+		},
 		data() {
 			return {
-				
+				deptBudgetList:{},
+				size: 10,
+				compId: sessionStorage.getItem('ws-pf_compId'),
+				iscause:false,
+				title:'',
+				status:0
 			}
 		},
 		activated() {
 			
 		},
 		methods: {
-		
+		reject(){
+			this.iscause=true
+			this.title='审核原因'
+			this.status=0
+			// this.$router.push({ name: 'inOutRecord' })
+		},
+		pass(){
+			this.iscause=true
+			this.title='审核原因'
+			this.status=1
+		},
+		submit(){
+			this.iscause=false
+		},
+		rejectclick(){
+			this.iscause=false
+		},
+		onChange() {
+			this.$refs.upload
+				.handleSaveBill()
+				.then(async response => {
+				this.deptBudgetList.addressUrl = response
+				})
+				.catch(res => {
+				EventBus.$emit('error', (JSON.parse(res) || {}).message)
+				this.$refs.upload.clearFiles()
+				})
+			},
 		},
 	}
 </script>

+ 172 - 3
src/views/tradeServicesManagement/inOutRecord.vue

@@ -1,7 +1,91 @@
 // 出入库记录
 <template>
 	<div>
-		
+		<el-row>
+			<el-col :span="12">
+				<h2 class="bg-left title">修改合同信息</h2>
+			</el-col>
+			<el-col :span="12" class="bg-right">
+				<el-button class="bg-bottom" type="primary" size="small" @click="returnsales()"><img width="6" height="10"
+					style="vertical-align: bottom; margin-right: 3px" src="../../../public/img/lujing.png" alt="" />
+				返回</el-button>
+			</el-col>
+		</el-row>
+		<el-row>
+			<el-col :span="12">
+				<span>鲅鱼圈1号库(102仓位)</span><span>现有储量:1000吨</span>
+				<el-date-picker v-model="value2" type="daterange" align="right" unlink-panels range-separator="至"
+					start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptions">
+				</el-date-picker>
+			</el-col>
+			<el-col :span="12" class="bg-right">
+				<el-button class="bg-bottom" type="primary" size="small" @click="adjustment()">
+				调整</el-button>
+				<el-button class="bg-bottom" type="primary" size="small" @click="print()">
+				打印</el-button>
+			</el-col>
+		</el-row>
+		<el-table
+        class="wenzi"
+        :data="recordList"
+        style="width: 100%"
+      >
+	  <el-table-column
+        :selectable="selectInit"
+        type="selection"
+        width="55"
+      ></el-table-column>
+      <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="goodsName" label="货名">
+        </el-table-column>
+		<el-table-column prop="operatorMajorRoleName" label="毛重(吨)">
+        </el-table-column>
+		<el-table-column prop="operatorMajorRoleName" label="皮重(吨)">
+        </el-table-column>
+		<el-table-column prop="operatorMajorRoleName" label="扣重(吨)">
+        </el-table-column>
+		<el-table-column prop="operatorMajorRoleName" label="净重(吨)">
+        </el-table-column>
+		<el-table-column prop="operatorMajorRoleName" label="类型">
+        </el-table-column>
+		<el-table-column prop="operatorMajorRoleName" label="磅单">
+        </el-table-column>
+		<el-table-column prop="operatorMajorRoleName" label="结算单">
+        </el-table-column>
+		<el-table-column prop="operatorMajorRoleName" label="出入库日期">
+        </el-table-column>
+     </el-table>
+	<el-dialog :visible.sync="isShowadjustment" title="收款截图">
+     <div>
+		 <el-input
+            v-model="deptBudgetList.goodsName"
+            placeholder="输入申请金额"
+            size="small"
+          ></el-input>
+	 </div>
+    </el-dialog>
+	<div class="mask" v-show="isShowPrintType"></div>
+	<div class="print-type" v-show="isShowPrintType">
+      <div class="print-type-content">
+        <div class="print-type-title">打印凭证</div>
+        <div class="print-type-checkbox">
+          <el-checkbox-group v-model="ruleForm.type">
+            <el-checkbox label="打印磅单" name="type" class="label-width" @change="selectType"></el-checkbox>
+            <el-checkbox label="打印结算单" name="type" class="label-width" @change="selectType"></el-checkbox>
+            <!-- <el-checkbox label="打印发票" name="type" class="label-width" @change="selectType($event)"></el-checkbox> -->
+          </el-checkbox-group>
+        </div>
+      </div>
+      <div class="bottom-btn">
+        <el-button @click="typePrintClick(printType)">确定</el-button>
+        <el-button @click="typePrintCannelClick">取消</el-button>
+      </div>
+    </div>
 	</div>
 </template>
 <script>
@@ -13,17 +97,102 @@
 		components: {},
 		data() {
 			return {
-				
+				recordList:[],
+				value2:'',
+				isShowadjustment:false,
+				ruleForm: {
+					type: [
+						'打印磅单',
+						'打印结算单',
+					]
+				},
+				isShowPrintType:false,
+				deptBudgetList:{},
+				pickerOptions:[]
 			}
 		},
 		activated() {
 			
 		},
 		methods: {
-		
+			returnsales() {
+				this.$router.go(-1)
+			},
+			adjustment(){
+				this.isShowadjustment=true
+			},
+			print(){
+				this.isShowPrintType=true
+			},
+			selectType(){
+
+			},
+			typePrintClick(){
+
+			},
+			selectInit(){
+
+			},
+			typePrintCannelClick() {
+				this.isShowPrintType = false
+			},
 		},
 	}
 </script>
 <style lang="scss" scoped>
+	.bg-left {
+    padding-left: 30px;
+  }
+
+  .bg-right {
+    padding-right: 10px;
+    text-align: right;
+  }
+	.title {
+    position: relative;
+  }
+.bg-bottom {
+    margin: 15px 0px;
+  }
+  .title::before {
+    content: '';
+    display: inline-block;
+    width: 5px;
+    height: 30px;
+    background: #5473e8;
+    position: absolute;
+    left: 0;
+  }
+  .mask {
+    background: black;
+    width: 100vw;
+    height: 100vh;
+    position: fixed;
+    top: 0;
+    z-index: 99;
+    opacity: 0.3;
+  }
+
+  .print-type {
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    margin: auto;
+    width: 200px;
+    height: 200px;
+    background: white;
+    border-radius: 10px;
+    z-index: 999;
+  }
+  .print-type-title {
+    text-align: center;
+    font-size: 18px;
+    margin: 20px;
+  }
+  .print-type-checkbox {
+    padding-left: 20px;
+  }
 
 </style>

+ 158 - 3
src/views/tradeServicesManagement/repayment.vue

@@ -1,7 +1,77 @@
 // 还款
+// 出入库记录
 <template>
 	<div>
-		
+		<el-row>
+			<el-col :span="12">
+				<h2 class="bg-left title">还款记录</h2>
+			</el-col>
+			<el-col :span="12" class="bg-right">
+			</el-col>
+		</el-row>
+		<div>
+			<span>鸡西银行</span><span>鲅鱼圈1号库</span><span>鸡西银行</span><span>1000吨</span><span>业务编号:211103001</span>
+		</div>
+		<el-row>
+			<el-col :span="12">
+				<span>鸡西银行</span><span>鲅鱼圈1号库</span><span>鸡西银行</span><span>1000吨</span><span>业务编号:211103001</span>
+			</el-col>
+			<el-col :span="12" class="bg-right">
+				<el-button class="bg-bottom" type="primary" size="small" @click="payment()">
+				还款</el-button>
+			</el-col>
+		</el-row>
+		<el-table
+        class="wenzi"
+        :data="recordList"
+        style="width: 100%"
+      >
+      <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="goodsName" label="还款金额(元)">
+        </el-table-column>
+		<el-table-column prop="operatorMajorRoleName" label="还款日期">
+        </el-table-column>
+		<el-table-column prop="operatorMajorRoleName" label="附件">
+        </el-table-column>
+		<el-table-column prop="operatorMajorRoleName" label="操作人">
+        </el-table-column>
+		<el-table-column prop="operatorMajorRoleName" label="操作时间">
+        </el-table-column>
+     </el-table>
+	 <el-dialog width="40%" :visible.sync="paymentForm" :append-to-body="true" title="还款">
+      <div class="tanchuang">
+        <ws-form>
+          <ws-info-table>
+            <ws-form-item label="待还金额(元)" prop="amountNotPayable">
+              {{
+              payments.amountNotPayable
+              }}
+            </ws-form-item>
+            <ws-form-item label="本次还款金额(元)" prop="money">
+              <ws-input type="number" @mousewheel.native.prevent v-model="payments.money" placeholder="请输入本次付款金额(元)"
+                maxlength="100" size="small" />
+            </ws-form-item>
+            <ws-form-item label="上传还款截图" prop=" paymentScreenshot"></ws-form-item>
+            <div class="upLoad">
+              <el-upload class="avatar-uploader" action="https://www.zthymaoyi.com/upload/admin" :show-file-list="false"
+                :on-success="handleAvatarSuccess">
+                <img v-if="imageUrl" :src="imageUrl" class="avatar" />
+                <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+              </el-upload>
+            </div>
+          </ws-info-table>
+          <div style="text-align: center; margin-top: 20px">
+            <el-button @click="paymentForm = false">取消</el-button>
+            <el-button @click="paymentSubmit">提交</el-button>
+          </div>
+        </ws-form>
+      </div>
+    </el-dialog>
 	</div>
 </template>
 <script>
@@ -13,17 +83,102 @@
 		components: {},
 		data() {
 			return {
-				
+				recordList:[],
+				value2:'',
+				isShowadjustment:false,
+				pickerOptions:[],
+				paymentForm:false,
+				payments:{}
 			}
 		},
 		activated() {
 			
 		},
 		methods: {
-		
+			returnsales() {
+				this.$router.go(-1)
+			},
+			selectType(){
+
+			},
+			typePrintClick(){
+
+			},
+			selectInit(){
+
+			},
+			payment() {
+				// this.imageUrl = ''
+				// if (this.modification.length == 0) {
+				// this.$message.warning('请选择要付款的条目')
+				// } else {
+				// let sum = 0
+				// let count = 0
+				// for (let i = 0; i < this.modification.length; i++) {
+				// 	sum += this.modification[i].amountIngPayable
+				// 	count += this.modification[i].amountEdPayable
+				// }
+				// this.payments.amountNotPayable = (sum - count).toFixed(2)
+				this.paymentForm = true
+				// }
+			},
 		},
 	}
 </script>
 <style lang="scss" scoped>
+	.bg-left {
+    padding-left: 30px;
+  }
+
+  .bg-right {
+    padding-right: 10px;
+    text-align: right;
+  }
+	.title {
+    position: relative;
+  }
+.bg-bottom {
+    margin: 15px 0px;
+  }
+  .title::before {
+    content: '';
+    display: inline-block;
+    width: 5px;
+    height: 30px;
+    background: #5473e8;
+    position: absolute;
+    left: 0;
+  }
+	.tanchuang {
+    margin: 0 auto;
+  }
+
+  .tanchuang .ws-info-table {
+    display: initial;
+  }
+
+  .tanchuang .ws-info-table .el-form-item {
+    margin: 0 auto;
+    text-align: center;
+  }
+   .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%;
+    min-width: 125px;
+    text-align: center;
+    background: #ffffff;
+    color: #8890b1;
+  }
 
+  /deep/.ws-info-table .el-form-item .el-form-item__content {
+    border: none;
+  }
 </style>

+ 164 - 5
src/views/tradeServicesManagement/warehouseReceiptAdd.vue

@@ -1,26 +1,185 @@
 //创建仓单
 <template>
 	<div>
-		
+		 <el-form
+      ref="deptBudgetList"
+      :rules="mainReportAdd"
+      :model="deptBudgetList"
+    >
+      <!-- <ws-info-table class="el-table"> -->
+		  <div>申请信息</div>
+        <el-form-item label="业务编号" span="1" prop="taskNo" class="forlist">
+          <el-input
+            v-model="deptBudgetList.taskNo"
+            placeholder="请输入任务编号"
+            maxlength="20"
+            size="small"
+            disabled
+          ></el-input>
+        </el-form-item>
+		<el-form-item label="名头" span="1" prop="taskNo" class="forlist">
+		  	<el-select v-model="deptBudgetList.region" placeholder="请选择名头">
+				<el-option label="区域一" value="shanghai"></el-option>
+				<el-option label="区域二" value="beijing"></el-option>
+			</el-select>
+        </el-form-item>
+		<el-form-item label="仓库名称" span="1" prop="taskNo" class="forlist">
+         	<el-select v-model="deptBudgetList.region" placeholder="请选择仓库">
+				<el-option label="区域一" value="shanghai"></el-option>
+				<el-option label="区域二" value="beijing"></el-option>
+			</el-select>
+        </el-form-item>
+		<el-form-item label="仓位号" span="1" prop="taskNo" class="forlist">
+         	<el-select v-model="deptBudgetList.region" placeholder="请选择仓位号">
+				<el-option label="区域一" value="shanghai"></el-option>
+				<el-option label="区域二" value="beijing"></el-option>
+			</el-select>
+        </el-form-item>
+		<el-form-item label="仓库地址" span="1" prop="taskNo" class="forlist">
+         	<el-input
+            disabled
+            v-model="deptBudgetList.goodsName"
+            placeholder="请输入仓库地址"
+            size="small"
+          ></el-input>
+        </el-form-item>
+        <el-form-item prop="goodsName" label="货名" span="1">
+            <el-select v-model="deptBudgetList.region" placeholder="请选择货名">
+				<el-option label="区域一" value="shanghai"></el-option>
+				<el-option label="区域二" value="beijing"></el-option>
+			</el-select>
+        </el-form-item>
+		<el-form-item prop="goodsName" label="货名" span="1">
+            <el-select v-model="deptBudgetList.region" placeholder="请选择货名">
+				<el-option label="区域一" value="shanghai"></el-option>
+				<el-option label="区域二" value="beijing"></el-option>
+			</el-select>
+        </el-form-item>
+		<el-form-item prop="goodsName" label="品级" span="1">
+            <el-select v-model="deptBudgetList.region" placeholder="请选择品级">
+				<el-option label="区域一" value="shanghai"></el-option>
+				<el-option label="区域二" value="beijing"></el-option>
+			</el-select>
+        </el-form-item>
+		<el-form-item label="现有储量" span="1" prop="taskNo" class="forlist">
+         	<el-input
+            disabled
+            v-model="deptBudgetList.goodsName"
+            placeholder="请输入现有储量"
+            size="small"
+          ></el-input>
+        </el-form-item>
+		<el-form-item label="可用储量(吨)" span="1" prop="taskNo" class="forlist">
+         	<el-input
+            disabled
+            v-model="deptBudgetList.goodsName"
+            placeholder="请输入可用储量"
+            size="small"
+          ></el-input>
+        </el-form-item>
+		<el-form-item label="本单重量(吨)" span="1" prop="taskNo" class="forlist">
+         	<el-input
+            v-model="deptBudgetList.goodsName"
+            placeholder="输入本次仓单申请所需的重量"
+            size="small"
+          ></el-input>
+        </el-form-item>
+		<el-form-item label="单价(元/吨)" span="1" prop="taskNo" class="forlist">
+         	<el-input
+            v-model="deptBudgetList.goodsName"
+            placeholder="输入粮食单价"
+            size="small"
+          ></el-input>
+        </el-form-item>
+		<el-form-item label="总价值(元)" span="1" prop="taskNo" class="forlist">
+         	<el-input
+            v-model="deptBudgetList.goodsName"
+            placeholder="自动计算,不可编辑"
+            size="small"
+          ></el-input>
+        </el-form-item>
+		<el-form-item label="申请比例(%)" span="1" prop="taskNo" class="forlist">
+         	<el-input
+            v-model="deptBudgetList.goodsName"
+            placeholder="输入申请比例"
+            size="small"
+          ></el-input>
+        </el-form-item>
+		<el-form-item label="申请金额(元)" span="1" prop="taskNo" class="forlist">
+         	<el-input
+            v-model="deptBudgetList.goodsName"
+            placeholder="输入申请金额"
+            size="small"
+          ></el-input>
+        </el-form-item>
+		<div>附件</div>
+		<ws-upload
+        ref="upload"
+        :comp-id="compId"
+        :appendix-ids="deptBudgetList.addressUrl"
+        :size-limit="size"
+        @onChange="onChange"
+        accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
+      />
+	  <div>外审部门</div>
+	  	<el-form-item prop="goodsName" label="银行" span="1">
+            <el-select v-model="deptBudgetList.region" placeholder="请选择银行">
+				<el-option label="区域一" value="shanghai"></el-option>
+				<el-option label="区域二" value="beijing"></el-option>
+			</el-select>
+        </el-form-item>
+		<el-form-item label="第三方" span="1" prop="taskNo" class="forlist">
+         	<el-input
+            v-model="deptBudgetList.goodsName"
+            placeholder="无"
+            size="small"
+          ></el-input>
+        </el-form-item>
+		<div>
+			 <el-button @click='inoutput' type="primary">出入库记录</el-button>
+			  <el-button @click='submit'  type="primary">提交审核</el-button>
+		</div>
+      <!-- </ws-info-table> -->
+		 </el-form>
 	</div>
 </template>
 <script>
 	import {
 		getList,
-	
 	} from '@/model/tradeServicesManagement/index'
+	import WsUpload from '@/components/WsUpload'
 	export default {
-		components: {},
+		components: {
+			WsUpload,
+		},
 		data() {
 			return {
-				
+				deptBudgetList:{},
+				size: 10,
+				compId: sessionStorage.getItem('ws-pf_compId'),
 			}
 		},
 		activated() {
 			
 		},
 		methods: {
-		
+		inoutput(){
+			this.$router.push({ name: 'inOutRecord' })
+		},
+		submit(){
+
+		},
+		onChange() {
+			this.$refs.upload
+				.handleSaveBill()
+				.then(async response => {
+				this.deptBudgetList.addressUrl = response
+				})
+				.catch(res => {
+				EventBus.$emit('error', (JSON.parse(res) || {}).message)
+				this.$refs.upload.clearFiles()
+				})
+			},
 		},
 	}
 </script>

+ 184 - 5
src/views/tradeServicesManagement/warehouseReceiptEdit.vue

@@ -1,26 +1,205 @@
 // 修改仓单
 <template>
 	<div>
-		
+		 <el-form
+      ref="deptBudgetList"
+      :rules="mainReportAdd"
+      :model="deptBudgetList"
+    >
+      <!-- <ws-info-table class="el-table"> -->
+		  <div>申请信息</div>
+        <el-form-item label="业务编号" span="1" prop="taskNo" class="forlist">
+          <el-input
+            v-model="deptBudgetList.taskNo"
+            placeholder="请输入任务编号"
+            maxlength="20"
+            size="small"
+            disabled
+          ></el-input>
+        </el-form-item>
+		<el-form-item label="名头" span="1" prop="taskNo" class="forlist">
+		  	<el-select v-model="deptBudgetList.region" placeholder="请选择名头">
+				<el-option label="区域一" value="shanghai"></el-option>
+				<el-option label="区域二" value="beijing"></el-option>
+			</el-select>
+        </el-form-item>
+		<el-form-item label="仓库名称" span="1" prop="taskNo" class="forlist">
+         	<el-select v-model="deptBudgetList.region" placeholder="请选择仓库">
+				<el-option label="区域一" value="shanghai"></el-option>
+				<el-option label="区域二" value="beijing"></el-option>
+			</el-select>
+        </el-form-item>
+		<el-form-item label="仓位号" span="1" prop="taskNo" class="forlist">
+         	<el-select v-model="deptBudgetList.region" placeholder="请选择仓位号">
+				<el-option label="区域一" value="shanghai"></el-option>
+				<el-option label="区域二" value="beijing"></el-option>
+			</el-select>
+        </el-form-item>
+		<el-form-item label="仓库地址" span="1" prop="taskNo" class="forlist">
+         	<el-input
+            disabled
+            v-model="deptBudgetList.goodsName"
+            placeholder="请输入仓库地址"
+            size="small"
+          ></el-input>
+        </el-form-item>
+        <el-form-item prop="goodsName" label="货名" span="1">
+            <el-select v-model="deptBudgetList.region" placeholder="请选择货名">
+				<el-option label="区域一" value="shanghai"></el-option>
+				<el-option label="区域二" value="beijing"></el-option>
+			</el-select>
+        </el-form-item>
+		<el-form-item prop="goodsName" label="货名" span="1">
+            <el-select v-model="deptBudgetList.region" placeholder="请选择货名">
+				<el-option label="区域一" value="shanghai"></el-option>
+				<el-option label="区域二" value="beijing"></el-option>
+			</el-select>
+        </el-form-item>
+		<el-form-item prop="goodsName" label="品级" span="1">
+            <el-select v-model="deptBudgetList.region" placeholder="请选择品级">
+				<el-option label="区域一" value="shanghai"></el-option>
+				<el-option label="区域二" value="beijing"></el-option>
+			</el-select>
+        </el-form-item>
+		<el-form-item label="现有储量" span="1" prop="taskNo" class="forlist">
+         	<el-input
+            disabled
+            v-model="deptBudgetList.goodsName"
+            placeholder="请输入现有储量"
+            size="small"
+          ></el-input>
+        </el-form-item>
+		<el-form-item label="可用储量(吨)" span="1" prop="taskNo" class="forlist">
+         	<el-input
+            disabled
+            v-model="deptBudgetList.goodsName"
+            placeholder="请输入可用储量"
+            size="small"
+          ></el-input>
+        </el-form-item>
+		<el-form-item label="本单重量(吨)" span="1" prop="taskNo" class="forlist">
+         	<el-input
+            v-model="deptBudgetList.goodsName"
+            placeholder="输入本次仓单申请所需的重量"
+            size="small"
+          ></el-input>
+        </el-form-item>
+		<el-form-item label="单价(元/吨)" span="1" prop="taskNo" class="forlist">
+         	<el-input
+            v-model="deptBudgetList.goodsName"
+            placeholder="输入粮食单价"
+            size="small"
+          ></el-input>
+        </el-form-item>
+		<el-form-item label="总价值(元)" span="1" prop="taskNo" class="forlist">
+         	<el-input
+            v-model="deptBudgetList.goodsName"
+            placeholder="自动计算,不可编辑"
+            size="small"
+          ></el-input>
+        </el-form-item>
+		<el-form-item label="申请比例(%)" span="1" prop="taskNo" class="forlist">
+         	<el-input
+            v-model="deptBudgetList.goodsName"
+            placeholder="输入申请比例"
+            size="small"
+          ></el-input>
+        </el-form-item>
+		<el-form-item label="申请金额(元)" span="1" prop="taskNo" class="forlist">
+         	<el-input
+            v-model="deptBudgetList.goodsName"
+            placeholder="输入申请金额"
+            size="small"
+          ></el-input>
+        </el-form-item>
+		<div>附件</div>
+		<ws-upload
+        ref="upload"
+        :comp-id="compId"
+        :appendix-ids="deptBudgetList.addressUrl"
+        :size-limit="size"
+        @onChange="onChange"
+        accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
+      />
+	  <div>外审部门</div>
+	  	<el-form-item prop="goodsName" label="银行" span="1">
+            <el-select v-model="deptBudgetList.region" placeholder="请选择银行">
+				<el-option label="区域一" value="shanghai"></el-option>
+				<el-option label="区域二" value="beijing"></el-option>
+			</el-select>
+        </el-form-item>
+		<el-form-item label="第三方" span="1" prop="taskNo" class="forlist">
+         	<el-input
+            v-model="deptBudgetList.goodsName"
+            placeholder="无"
+            size="small"
+          ></el-input>
+        </el-form-item>
+		<div>
+			 <el-button @click='inoutput' type="primary">出入库记录</el-button>
+			  <el-button @click='submit'  type="primary">提交审核</el-button>
+		</div>
+		<div>审核记录</div>
+		 <el-table
+        class="wenzi"
+        :data="taskhistories"
+        style="width: 100%"
+      >
+        <el-table-column prop="operatorMajorRoleName" label="审核人">
+          <template scope="scope">
+            {{scope.row.operatorMajorRoleName}}{{scope.row.operatorName}}
+            </template>
+        </el-table-column>
+        <el-table-column prop="inOutTaskNo" label="审核结果">
+          <template scope="scope">
+            <span v-if='scope.row.approved'>通过</span>
+            <span v-if='!scope.row.approved'>驳回</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="endTime" label="审核时间"></el-table-column>
+        <el-table-column prop="auditMind" label="审核意见"></el-table-column>
+     </el-table>
+      <!-- </ws-info-table> -->
+		 </el-form>
 	</div>
 </template>
 <script>
 	import {
 		getList,
-	
 	} from '@/model/tradeServicesManagement/index'
+	import WsUpload from '@/components/WsUpload'
 	export default {
-		components: {},
+		components: {
+			WsUpload,
+		},
 		data() {
 			return {
-				
+				deptBudgetList:{},
+				size: 10,
+				compId: sessionStorage.getItem('ws-pf_compId'),
 			}
 		},
 		activated() {
 			
 		},
 		methods: {
-		
+		inoutput(){
+			this.$router.push({ name: 'inOutRecord' })
+		},
+		submit(){
+
+		},
+		onChange() {
+			this.$refs.upload
+				.handleSaveBill()
+				.then(async response => {
+				this.deptBudgetList.addressUrl = response
+				})
+				.catch(res => {
+				EventBus.$emit('error', (JSON.parse(res) || {}).message)
+				this.$refs.upload.clearFiles()
+				})
+			},
 		},
 	}
 </script>

+ 184 - 5
src/views/tradeServicesManagement/warehouseReceiptLook.vue

@@ -1,26 +1,205 @@
 // 查看仓单
 <template>
 	<div>
-		
+		 <el-form
+      ref="deptBudgetList"
+      :rules="mainReportAdd"
+      :model="deptBudgetList"
+    >
+      <!-- <ws-info-table class="el-table"> -->
+		  <div>申请信息</div>
+        <el-form-item label="业务编号" span="1" prop="taskNo" class="forlist">
+          <el-input
+            v-model="deptBudgetList.taskNo"
+            placeholder="请输入任务编号"
+            maxlength="20"
+            size="small"
+            disabled
+          ></el-input>
+        </el-form-item>
+		<el-form-item label="名头" span="1" prop="taskNo" class="forlist">
+		  	<el-select v-model="deptBudgetList.region" placeholder="请选择名头">
+				<el-option label="区域一" value="shanghai"></el-option>
+				<el-option label="区域二" value="beijing"></el-option>
+			</el-select>
+        </el-form-item>
+		<el-form-item label="仓库名称" span="1" prop="taskNo" class="forlist">
+         	<el-select v-model="deptBudgetList.region" placeholder="请选择仓库">
+				<el-option label="区域一" value="shanghai"></el-option>
+				<el-option label="区域二" value="beijing"></el-option>
+			</el-select>
+        </el-form-item>
+		<el-form-item label="仓位号" span="1" prop="taskNo" class="forlist">
+         	<el-select v-model="deptBudgetList.region" placeholder="请选择仓位号">
+				<el-option label="区域一" value="shanghai"></el-option>
+				<el-option label="区域二" value="beijing"></el-option>
+			</el-select>
+        </el-form-item>
+		<el-form-item label="仓库地址" span="1" prop="taskNo" class="forlist">
+         	<el-input
+            disabled
+            v-model="deptBudgetList.goodsName"
+            placeholder="请输入仓库地址"
+            size="small"
+          ></el-input>
+        </el-form-item>
+        <el-form-item prop="goodsName" label="货名" span="1">
+            <el-select v-model="deptBudgetList.region" placeholder="请选择货名">
+				<el-option label="区域一" value="shanghai"></el-option>
+				<el-option label="区域二" value="beijing"></el-option>
+			</el-select>
+        </el-form-item>
+		<el-form-item prop="goodsName" label="货名" span="1">
+            <el-select v-model="deptBudgetList.region" placeholder="请选择货名">
+				<el-option label="区域一" value="shanghai"></el-option>
+				<el-option label="区域二" value="beijing"></el-option>
+			</el-select>
+        </el-form-item>
+		<el-form-item prop="goodsName" label="品级" span="1">
+            <el-select v-model="deptBudgetList.region" placeholder="请选择品级">
+				<el-option label="区域一" value="shanghai"></el-option>
+				<el-option label="区域二" value="beijing"></el-option>
+			</el-select>
+        </el-form-item>
+		<el-form-item label="现有储量" span="1" prop="taskNo" class="forlist">
+         	<el-input
+            disabled
+            v-model="deptBudgetList.goodsName"
+            placeholder="请输入现有储量"
+            size="small"
+          ></el-input>
+        </el-form-item>
+		<el-form-item label="可用储量(吨)" span="1" prop="taskNo" class="forlist">
+         	<el-input
+            disabled
+            v-model="deptBudgetList.goodsName"
+            placeholder="请输入可用储量"
+            size="small"
+          ></el-input>
+        </el-form-item>
+		<el-form-item label="本单重量(吨)" span="1" prop="taskNo" class="forlist">
+         	<el-input
+            v-model="deptBudgetList.goodsName"
+            placeholder="输入本次仓单申请所需的重量"
+            size="small"
+          ></el-input>
+        </el-form-item>
+		<el-form-item label="单价(元/吨)" span="1" prop="taskNo" class="forlist">
+         	<el-input
+            v-model="deptBudgetList.goodsName"
+            placeholder="输入粮食单价"
+            size="small"
+          ></el-input>
+        </el-form-item>
+		<el-form-item label="总价值(元)" span="1" prop="taskNo" class="forlist">
+         	<el-input
+            v-model="deptBudgetList.goodsName"
+            placeholder="自动计算,不可编辑"
+            size="small"
+          ></el-input>
+        </el-form-item>
+		<el-form-item label="申请比例(%)" span="1" prop="taskNo" class="forlist">
+         	<el-input
+            v-model="deptBudgetList.goodsName"
+            placeholder="输入申请比例"
+            size="small"
+          ></el-input>
+        </el-form-item>
+		<el-form-item label="申请金额(元)" span="1" prop="taskNo" class="forlist">
+         	<el-input
+            v-model="deptBudgetList.goodsName"
+            placeholder="输入申请金额"
+            size="small"
+          ></el-input>
+        </el-form-item>
+		<div>附件</div>
+		<ws-upload
+        ref="upload"
+        :comp-id="compId"
+        :appendix-ids="deptBudgetList.addressUrl"
+        :size-limit="size"
+        @onChange="onChange"
+        accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
+      />
+	  <div>外审部门</div>
+	  	<el-form-item prop="goodsName" label="银行" span="1">
+            <el-select v-model="deptBudgetList.region" placeholder="请选择银行">
+				<el-option label="区域一" value="shanghai"></el-option>
+				<el-option label="区域二" value="beijing"></el-option>
+			</el-select>
+        </el-form-item>
+		<el-form-item label="第三方" span="1" prop="taskNo" class="forlist">
+         	<el-input
+            v-model="deptBudgetList.goodsName"
+            placeholder="无"
+            size="small"
+          ></el-input>
+        </el-form-item>
+		<div>
+			 <el-button @click='inoutput' type="primary">出入库记录</el-button>
+			  <el-button @click='submit'  type="primary">提交审核</el-button>
+		</div>
+		<div>审核记录</div>
+		 <el-table
+        class="wenzi"
+        :data="taskhistories"
+        style="width: 100%"
+      >
+        <el-table-column prop="operatorMajorRoleName" label="审核人">
+          <template scope="scope">
+            {{scope.row.operatorMajorRoleName}}{{scope.row.operatorName}}
+            </template>
+        </el-table-column>
+        <el-table-column prop="inOutTaskNo" label="审核结果">
+          <template scope="scope">
+            <span v-if='scope.row.approved'>通过</span>
+            <span v-if='!scope.row.approved'>驳回</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="endTime" label="审核时间"></el-table-column>
+        <el-table-column prop="auditMind" label="审核意见"></el-table-column>
+     </el-table>
+      <!-- </ws-info-table> -->
+		 </el-form>
 	</div>
 </template>
 <script>
 	import {
 		getList,
-	
 	} from '@/model/tradeServicesManagement/index'
+	import WsUpload from '@/components/WsUpload'
 	export default {
-		components: {},
+		components: {
+			WsUpload,
+		},
 		data() {
 			return {
-				
+				deptBudgetList:{},
+				size: 10,
+				compId: sessionStorage.getItem('ws-pf_compId'),
 			}
 		},
 		activated() {
 			
 		},
 		methods: {
-		
+		inoutput(){
+			this.$router.push({ name: 'inOutRecord' })
+		},
+		submit(){
+
+		},
+		onChange() {
+			this.$refs.upload
+				.handleSaveBill()
+				.then(async response => {
+				this.deptBudgetList.addressUrl = response
+				})
+				.catch(res => {
+				EventBus.$emit('error', (JSON.parse(res) || {}).message)
+				this.$refs.upload.clearFiles()
+				})
+			},
 		},
 	}
 </script>