6.27

supervise-risk-ui/src/views/risk/RiskManage/RiskAdd.vue

@@ -103,7 +103,8 @@ export default {
 				typeName:'',
 				typeSid:'',
         remarks:'',
-        reportTarget:''
+        reportTarget:'',
+        list:[]
 			},
 			rules: {
 				name: [{ required: true, message: '风险等级名称不能为空', trigger: 'blur' }],
@@ -112,7 +113,7 @@ export default {
 				reportTarget: [{ required: true, message: '报送单位不能为空', trigger: 'blur' }], 
 			},
       optionProps: {
-				value: 'code',
+				value: 'name',
 				label: 'name',
 				children: 'down',
 				expandTrigger: 'hover',
@@ -174,6 +175,7 @@ export default {
 			_this.formobj.typeCode = vdata.typeCode 
 			_this.formobj.reportTarget = vdata.reportTarget 
 			_this.formobj.remarks = vdata.remarks
+			_this.selectedOptions= vdata.list
 		},
     getParentsById(list, id) {
       for (let i in list) {
@@ -246,7 +248,8 @@ export default {
         this.formobj.levelName = choose[0].name
       },
       handleChange3(value) {
-        console.log(value);
+      this.formobj.list.push(value)
+      console.log(this.formobj);
       var getSId = this.$refs.cascaderAddr.getCheckedNodes()[0].data.sid
       this.formobj.typeSid=getSId
 			var thsAreaCode = this.$refs.cascaderAddr.getCheckedNodes()[0].pathLabels;  //注意2： 获取label值

warehousing-system/project_web/src/components/instorehouse/putIn.vue

@@ -132,10 +132,10 @@ export default {
           this.inStorehouse
         );
         if (result.code != 200){
-          alert(result.msg);
+          this.$message.error(result.msg)
           return ;
         }
-        alert('操作成功');
+        this.$message.success('操作成功')
         this.$refs.onPutInRuleForm.resetFields();
       });
     },

warehousing-system/project_web/src/components/stockManagement/stockList.vue

@@ -9,8 +9,9 @@
       </el-col>
     </el-row>
     <el-table :data="stockList.slice((queryInfo.pageNum-1)*queryInfo.pageSize,queryInfo.pageNum*queryInfo.pageSize)"
-    style="width: 100%"
+    style="width: 100%" height="500"
     stripe border fixed>
+    <el-table-column label="序号" type="index" width="60" :index="indexMethod" fixed align="center" />
         <el-table-column
           align="center"
           prop="proName"
@@ -37,14 +38,14 @@
         </el-table-column>
         <el-table-column
           align="center"
-          prop="num"
+          prop="confirmedPrice"
-          label="数量"
+          label="单价"
           width="80">
         </el-table-column>
         <el-table-column
           align="center"
-          prop="weight"
+          prop="num"
-          label="重量"
+          label="数量"
           width="80">
         </el-table-column>
       <el-table-column
@@ -102,7 +103,7 @@ export default {
       queryInfo: {
         query: '',
         pageNum: 1,
-        pageSize: 10
+        pageSize: 5
       },
       total: 0,
       stockList: []
@@ -118,7 +119,12 @@ export default {
       this.queryInfo.pageNum = val
       this.getStockList()
     },
-
+     // 序号
+     indexMethod(index) {
+     var pagestart = (this.queryInfo.pageNum - 1) * this.queryInfo.pageSize
+     var pageindex = index + 1 + pagestart
+     return pageindex
+      },
     async getStockList () {
       const { data: result } = await this.$http.post('/stock/listPage', { params: this.queryInfo })
       if (result.code !== "200") return this.$message.error('获取列表失败')