|
|
@@ -12,7 +12,7 @@
|
|
|
<el-col :span="5">
|
|
|
<el-form-item label="工序名称">
|
|
|
<el-select
|
|
|
- filterable
|
|
|
+ filterable
|
|
|
clearable
|
|
|
v-model="filterForm.data.gx_name"
|
|
|
:disabled="filterForm.disabled.gx_name"
|
|
|
@@ -30,7 +30,7 @@
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
- <el-col :span="5">
|
|
|
+ <!-- <el-col :span="5">
|
|
|
<el-form-item label="物资大类">
|
|
|
<el-input clearable
|
|
|
v-model.trim="filterForm.data.wzdl_name"
|
|
|
@@ -39,7 +39,7 @@
|
|
|
@keyup.enter.native="getTableData(1)"
|
|
|
></el-input>
|
|
|
</el-form-item>
|
|
|
- </el-col>
|
|
|
+ </el-col> -->
|
|
|
<el-col :span="5">
|
|
|
<el-form-item label="物资类别">
|
|
|
<el-input clearable
|
|
|
@@ -179,7 +179,7 @@
|
|
|
<span v-else>{{ nameObj.gx_name.obj[scope.row.gx_name] ? nameObj.gx_name.obj[scope.row.gx_name] : scope.row.gx_name }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column
|
|
|
+ <!-- <el-table-column
|
|
|
sortable
|
|
|
prop="wzdl_name"
|
|
|
label="物资大类"
|
|
|
@@ -208,7 +208,7 @@
|
|
|
</el-form-item>
|
|
|
<span v-else>{{scope.row.wzdl_name}}</span>
|
|
|
</template>
|
|
|
- </el-table-column>
|
|
|
+ </el-table-column> -->
|
|
|
<el-table-column
|
|
|
sortable
|
|
|
prop="wzlb_name"
|
|
|
@@ -221,11 +221,30 @@
|
|
|
:prop="scope.row.tno + '.wzlb_name'"
|
|
|
:rules="dialog.editorBox.form.rules.wzlb_name"
|
|
|
>
|
|
|
- <el-input
|
|
|
+ <!-- <el-input
|
|
|
clearable
|
|
|
style="width: 100%;"
|
|
|
v-model="tableFormDataObj[scope.row.tno].wzlb_name"
|
|
|
- ></el-input>
|
|
|
+ ></el-input> -->
|
|
|
+ <el-select
|
|
|
+ clearable
|
|
|
+ style="width: 100%;"
|
|
|
+ v-model="tableFormDataObj[scope.row.tno].wzlb_name"
|
|
|
+ placeholder="请选择物资类别"
|
|
|
+ >
|
|
|
+ <el-option label="侦检" value="侦检"></el-option>
|
|
|
+ <el-option label="警戒" value="警戒"></el-option>
|
|
|
+ <el-option label="灭火" value="灭火"></el-option>
|
|
|
+ <el-option label="通信" value="通信"></el-option>
|
|
|
+ <el-option label="救生" value="救生"></el-option>
|
|
|
+ <el-option label="破拆" value="破拆"></el-option>
|
|
|
+ <el-option label="堵漏" value="堵漏"></el-option>
|
|
|
+ <el-option label="输转" value="输转"></el-option>
|
|
|
+ <el-option label="洗消" value="洗消"></el-option>
|
|
|
+ <el-option label="排烟照明" value="排烟照明"></el-option>
|
|
|
+ <el-option label="其他" value="其他"></el-option>
|
|
|
+ <el-option label="防汛" value="防汛"></el-option>
|
|
|
+ </el-select>
|
|
|
<template
|
|
|
slot="error"
|
|
|
slot-scope="scope"
|
|
|
@@ -237,7 +256,7 @@
|
|
|
</template>
|
|
|
</el-form-item>
|
|
|
<span v-else>{{scope.row.wzlb_name}}</span>
|
|
|
- </template>
|
|
|
+ </template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
sortable
|
|
|
@@ -278,7 +297,7 @@
|
|
|
><template slot-scope="scope">
|
|
|
<el-form-item
|
|
|
v-if="scope.row.isSelection"
|
|
|
- :prop="scope.row.tno + '.xh'"
|
|
|
+ :prop="scope.row.tno + '.xh'"
|
|
|
>
|
|
|
<el-input
|
|
|
clearable
|
|
|
@@ -296,14 +315,44 @@
|
|
|
</template>
|
|
|
</el-form-item>
|
|
|
<span v-else>{{scope.row.xh}}</span>
|
|
|
- </template>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ sortable
|
|
|
+ prop="kcl"
|
|
|
+ label="库存量"
|
|
|
+ min-width="100px"
|
|
|
+ :show-overflow-tooltip="true"
|
|
|
+ ><template slot-scope="scope">
|
|
|
+ <el-form-item
|
|
|
+ v-if="scope.row.isSelection"
|
|
|
+ :prop="scope.row.tno + '.kcl'"
|
|
|
+ :rules="dialog.editorBox.form.rules.kcl"
|
|
|
+ >
|
|
|
+ <el-input
|
|
|
+ clearable
|
|
|
+ style="width: 100%;"
|
|
|
+ v-model="tableFormDataObj[scope.row.tno].kcl"
|
|
|
+ ></el-input>
|
|
|
+ <template
|
|
|
+ slot="error"
|
|
|
+ slot-scope="scope"
|
|
|
+ >
|
|
|
+ <p
|
|
|
+ class="error"
|
|
|
+ :title="scope.error"
|
|
|
+ >{{ scope.error }}</p>
|
|
|
+ </template>
|
|
|
+ </el-form-item>
|
|
|
+ <span v-else>{{scope.row.kcl}}</span>
|
|
|
+ </template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
sortable
|
|
|
prop="dw"
|
|
|
label="单位"
|
|
|
min-width="80px"
|
|
|
- :show-overflow-tooltip="true">
|
|
|
+ :show-overflow-tooltip="true">
|
|
|
<template slot-scope="scope">
|
|
|
<el-form-item
|
|
|
v-if="scope.row.isSelection"
|
|
|
@@ -342,7 +391,7 @@
|
|
|
label="存放地点"
|
|
|
min-width="150px"
|
|
|
:show-overflow-tooltip="true"
|
|
|
- >
|
|
|
+ >
|
|
|
<template slot-scope="scope">
|
|
|
<el-form-item
|
|
|
v-if="scope.row.isSelection"
|
|
|
@@ -365,7 +414,7 @@
|
|
|
</template>
|
|
|
</el-form-item>
|
|
|
<span v-else>{{scope.row.yjwz_dd}}</span>
|
|
|
- </template>
|
|
|
+ </template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
sortable
|
|
|
@@ -395,7 +444,7 @@
|
|
|
</template>
|
|
|
</el-form-item>
|
|
|
<span v-else>{{scope.row.yjwz_ry}}</span>
|
|
|
- </template>
|
|
|
+ </template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
sortable
|
|
|
@@ -425,9 +474,9 @@
|
|
|
</template>
|
|
|
</el-form-item>
|
|
|
<span v-else>{{scope.row.lxdh}}</span>
|
|
|
- </template>
|
|
|
+ </template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column
|
|
|
+ <!-- <el-table-column
|
|
|
sortable
|
|
|
prop="hsyjz1"
|
|
|
label="黄色预警"
|
|
|
@@ -456,7 +505,7 @@
|
|
|
</template>
|
|
|
</el-form-item>
|
|
|
<span v-else>{{scope.row.hsyjz1}}</span>
|
|
|
- </template>
|
|
|
+ </template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
sortable
|
|
|
@@ -487,38 +536,9 @@
|
|
|
</template>
|
|
|
</el-form-item>
|
|
|
<span v-else>{{scope.row.hsyjz2}}</span>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- sortable
|
|
|
- prop="kcl"
|
|
|
- label="库存量"
|
|
|
- min-width="100px"
|
|
|
- :show-overflow-tooltip="true"
|
|
|
- ><template slot-scope="scope">
|
|
|
- <el-form-item
|
|
|
- v-if="scope.row.isSelection"
|
|
|
- :prop="scope.row.tno + '.kcl'"
|
|
|
- :rules="dialog.editorBox.form.rules.kcl"
|
|
|
- >
|
|
|
- <el-input
|
|
|
- clearable
|
|
|
- style="width: 100%;"
|
|
|
- v-model="tableFormDataObj[scope.row.tno].kcl"
|
|
|
- ></el-input>
|
|
|
- <template
|
|
|
- slot="error"
|
|
|
- slot-scope="scope"
|
|
|
- >
|
|
|
- <p
|
|
|
- class="error"
|
|
|
- :title="scope.error"
|
|
|
- >{{ scope.error }}</p>
|
|
|
- </template>
|
|
|
- </el-form-item>
|
|
|
- <span v-else>{{scope.row.kcl}}</span>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
+ </template>
|
|
|
+ </el-table-column> -->
|
|
|
+
|
|
|
<el-table-column
|
|
|
sortable
|
|
|
prop="memo"
|
|
|
@@ -548,7 +568,7 @@
|
|
|
</template>
|
|
|
</el-form-item>
|
|
|
<span v-else>{{scope.row.memo}}</span>
|
|
|
- </template>
|
|
|
+ </template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
sortable
|
|
|
@@ -631,7 +651,7 @@
|
|
|
</el-row>
|
|
|
<el-row>
|
|
|
<el-col :span="12">
|
|
|
- <el-form-item
|
|
|
+ <!-- <el-form-item
|
|
|
label="物资类别"
|
|
|
prop="wzlb_name"
|
|
|
>
|
|
|
@@ -640,6 +660,30 @@
|
|
|
style="width: 100%;margin-bottom:0px;line-height:15px"
|
|
|
v-model="dialog.editorBox.form.data.wzlb_name"
|
|
|
></el-input>
|
|
|
+ </el-form-item> -->
|
|
|
+ <el-form-item
|
|
|
+ label="物资类别"
|
|
|
+ prop="wzlb_name"
|
|
|
+ >
|
|
|
+ <el-select
|
|
|
+ clearable
|
|
|
+ style="width: 100%; margin-bottom: 0px; line-height: 15px"
|
|
|
+ v-model="dialog.editorBox.form.data.wzlb_name"
|
|
|
+ placeholder="请选择物资类别"
|
|
|
+ >
|
|
|
+ <el-option label="侦检" value="侦检"></el-option>
|
|
|
+ <el-option label="警戒" value="警戒"></el-option>
|
|
|
+ <el-option label="灭火" value="灭火"></el-option>
|
|
|
+ <el-option label="通信" value="通信"></el-option>
|
|
|
+ <el-option label="救生" value="救生"></el-option>
|
|
|
+ <el-option label="破拆" value="破拆"></el-option>
|
|
|
+ <el-option label="堵漏" value="堵漏"></el-option>
|
|
|
+ <el-option label="输转" value="输转"></el-option>
|
|
|
+ <el-option label="洗消" value="洗消"></el-option>
|
|
|
+ <el-option label="排烟照明" value="排烟照明"></el-option>
|
|
|
+ <el-option label="其他" value="其他"></el-option>
|
|
|
+ <el-option label="防汛" value="防汛"></el-option>
|
|
|
+ </el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="12">
|
|
|
@@ -729,6 +773,18 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="12">
|
|
|
+ <el-form-item
|
|
|
+ label="库存量"
|
|
|
+ prop="kcl"
|
|
|
+ >
|
|
|
+ <el-input
|
|
|
+ clearable
|
|
|
+ style="width: 100%;"
|
|
|
+ v-model="dialog.editorBox.form.data.kcl"
|
|
|
+ ></el-input>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <!-- <el-col :span="12">
|
|
|
<el-form-item
|
|
|
label="黄色预警"
|
|
|
prop="hsyjz1"
|
|
|
@@ -739,10 +795,10 @@
|
|
|
v-model="dialog.editorBox.form.data.hsyjz1"
|
|
|
></el-input>
|
|
|
</el-form-item>
|
|
|
- </el-col>
|
|
|
+ </el-col> -->
|
|
|
</el-row>
|
|
|
- <el-row>
|
|
|
- <el-col :span="12">
|
|
|
+ <!-- <el-row>
|
|
|
+ <el-col :span="12">
|
|
|
<el-form-item
|
|
|
label="红色预警"
|
|
|
prop="hsyjz2"
|
|
|
@@ -766,7 +822,7 @@
|
|
|
></el-input>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
- </el-row>
|
|
|
+ </el-row> -->
|
|
|
<el-row>
|
|
|
<el-col :span="12">
|
|
|
<el-form-item
|
|
|
@@ -804,7 +860,7 @@
|
|
|
<script>
|
|
|
import { checkTel , checkNumber , zCheckNumber2 } from '~/utils/validator.js'
|
|
|
import { formatDate } from '@/utils/util.js'
|
|
|
-import store from '@/store/index.js'
|
|
|
+import store from '@/store/index.js'
|
|
|
export default {
|
|
|
name: 'emermaterials',
|
|
|
data () {
|
|
|
@@ -948,7 +1004,7 @@ export default {
|
|
|
],
|
|
|
hsyjz2: [
|
|
|
{validator: checkNumber, trigger: 'change'},
|
|
|
- {validator: checkhsyjz2, trigger: 'change' }
|
|
|
+ {validator: checkhsyjz2, trigger: 'change' }
|
|
|
],
|
|
|
hsyjz3: [
|
|
|
{validator: checkNumber, trigger: 'change'}
|
|
|
@@ -1052,7 +1108,7 @@ export default {
|
|
|
if (that.$route.query.gx_name) {
|
|
|
that.filterForm.disabled.gx_name = true;
|
|
|
that.dialog.editorBox.form.disabled.gx_name = true;
|
|
|
- that.filterForm.data.gx_name = that.$route.query.gx_name.split(',')
|
|
|
+ that.filterForm.data.gx_name = that.$route.query.gx_name.split(',')
|
|
|
}
|
|
|
// that.getEnergyTypeIdData();
|
|
|
//that.getEnergyIdData();
|
|
|
@@ -1067,7 +1123,7 @@ export default {
|
|
|
that.getTableData();
|
|
|
},
|
|
|
methods: {
|
|
|
- tableRowClassName({row,rowIndex}){
|
|
|
+ tableRowClassName({row,rowIndex}){
|
|
|
if(row.kcl !='' && row.kcl != null){
|
|
|
let hsyjz1 = row.hsyjz1 - 0;
|
|
|
let hsyjz2 = row.hsyjz2 - 0;
|
|
|
@@ -1081,7 +1137,7 @@ export default {
|
|
|
if(rowIndex % 2 ==1){
|
|
|
return 'blue-row';
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
},
|
|
|
but_del_plural () {
|
|
|
let that = this;
|
|
|
@@ -1117,7 +1173,7 @@ export default {
|
|
|
this.$message.error('至少要选择一条数据');
|
|
|
}
|
|
|
},
|
|
|
-
|
|
|
+
|
|
|
handleSelectionChange (val) {
|
|
|
let that = this;
|
|
|
let tableFormDataObj = {};
|
|
|
@@ -1278,7 +1334,7 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
but_add () {
|
|
|
- let that = this;
|
|
|
+ let that = this;
|
|
|
that.dialog.editorBox.type = 'ADD';
|
|
|
that.dialog.editorBox.show = true;
|
|
|
for (let key in that.dialog.editorBox.form.data) {
|
|
|
@@ -1307,7 +1363,7 @@ export default {
|
|
|
hsyjz2: that.dialog.editorBox.form.data.hsyjz2,
|
|
|
kcl: that.dialog.editorBox.form.data.kcl,
|
|
|
memo: that.dialog.editorBox.form.data.memo
|
|
|
- };
|
|
|
+ };
|
|
|
that.$refs['dialog_form'].validate((valid) => {
|
|
|
if (valid) {
|
|
|
if (that.dialog.editorBox.type === 'ADD') {
|
|
|
@@ -1328,7 +1384,7 @@ export default {
|
|
|
message: '新增成功',
|
|
|
type: 'success'
|
|
|
});
|
|
|
-
|
|
|
+
|
|
|
that.getTableData();
|
|
|
that.dialog.editorBox.show = false;
|
|
|
} else {
|
张晓宇