Browse Source

6.15

master
fengdong777 2 years ago
parent
commit
9134bd8489
  1. 1
      supervise-organizational-ui/src/views/brank/brankAdd.vue
  2. 122
      warehousing-system/project_web/src/components/ButtonBar/index.vue
  3. 238
      warehousing-system/project_web/src/components/initial_value/storehouse.vue
  4. 5
      warehousing-system/project_web/src/plugins/element.js
  5. 8
      yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/api/yxtdispatchcenter/dispatchmodletemplate.js
  6. 16
      yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/api/yxtdispatchcenter/dispatchorderinfo.js
  7. 215
      yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/components/AreaPicker/index.vue
  8. 28
      yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchmodletemplate/dispatchmodletemplate.vue
  9. 44
      yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchorderinfo/dispatchorderinfoAdd.vue
  10. 143
      yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchorderinfo/dispatchpatrolplanAdds.vue
  11. 3
      yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchworker/dispatchworker.vue

1
supervise-organizational-ui/src/views/brank/brankAdd.vue

@ -23,7 +23,6 @@
<el-input v-model="formobj.bankAbbreviation" placeholder="" class="item_input" style="width: 520px;"
clearable />
</div>
<div class="item">
<span class="item_text">--</span>
<div class="item_input">

122
warehousing-system/project_web/src/components/ButtonBar/index.vue

@ -0,0 +1,122 @@
<template>
<!--标题按钮部分开始-->
<div class="tab-header webtop">
<!--标题-->
<div>{{ viewTitle }}</div>
<!--start 按钮部分开始 :icon="item.icon"-->
<div>
<el-button v-for="item in btnList" :key="item.btnKey" :type="item.type" :size="item.size" :disabled="btndisabled" @click="btnHandle(item.btnKey)">
<svg-icon v-if="item.icon" :iconClass="item.icon"/>{{ item.btnLabel }}
</el-button>
</div>
<!--end 按钮部分结束-->
</div>
<!--标题按钮部分结束-->
</template>
<script>
export default {
name: 'ButtonBar',
props: {
viewTitle: String,
btndisabled: { type: Boolean, default: false }
},
data() {
return {
currentPath: this.$route.path,
userSid: this.$store.getters.userInfo ? this.$store.getters.userInfo.userSid : '',
btnList: [
{
type: 'primary',
size: 'small',
icon: 'plus',
btnKey: 'toAdd',
btnLabel: '新增'
},
{
type: 'primary',
size: 'small',
icon: 'edit',
btnKey: 'toEdit',
btnLabel: '编辑'
},
{
type: 'primary',
size: 'small',
icon: 'submit',
btnKey: 'doSubmit',
btnLabel: '提交'
},
{
type: 'danger',
size: 'small',
icon: 'del',
btnKey: 'doDel',
btnLabel: '删除'
},
{
type: 'success',
size: 'small',
icon: 'Import',
btnKey: 'doImport',
btnLabel: '导入'
},
{
type: 'success',
size: 'small',
icon: 'export',
btnKey: 'build',
btnLabel: '导出'
},
{
type: 'info',
size: 'small',
icon: 'cross',
btnKey: 'doClose',
btnLabel: '关闭'
}
]
}
},
created: function() {
this.initPermission()
},
methods: {
initPermission() {
console.log('*******************当前路径 ' + this.currentPath)
console.log('*******************当前用户 ' + this.userSid)
const params = {
currentPath: this.currentPath,
userSid: this.userSid
}
// req
// .buttonPermission(params)
// .then(resp => {
// if (resp.success) {
// this.btnList = resp.data
// }
// })
// .catch(e => {
// console.log('' + e)
// })
},
btnHandle(btnKey) {
this.$emit('btnhandle', btnKey)
},
setButtonList(value) {
this.btnList = value
}
}
}
</script>
<style scoped>
.svg-icon {
width: 1em;
height: 1em;
vertical-align: -0.16em;
fill: currentColor;
overflow: hidden;
margin-right: 3px;
}
</style>

238
warehousing-system/project_web/src/components/initial_value/storehouse.vue

@ -58,21 +58,121 @@
</el-pagination>
</el-card>
<el-dialog :title="title" :visible.sync="storehouseDialogVisible" width="65%" @close="closeStorehouseDialog">
<el-form :model="storehouseForm" :rules="rules" ref="storehouseRuleForm" label-width="100px" class="demo-ruleForm">
<el-form-item label="仓库名称" prop="name">
<el-input v-model="storehouseForm.name" ></el-input>
</el-form-item>
<el-form-item label="仓库别名" prop="simpleName">
<el-input v-model="storehouseForm.simpleName" ></el-input>
</el-form-item>
<el-form-item label="仓库地址" prop="addr">
<el-input v-model="storehouseForm.addr" ></el-input>
</el-form-item>
<el-form-item label="备 注" prop="remarks">
<el-input v-model="storehouseForm.remarks" ></el-input>
</el-form-item>
<el-dialog :title="title" :visible.sync="storehouseDialogVisible" width="65%" >
<el-form :model="form" :rules="rules" ref="form" label-position="right" class="demo-form-inline">
<el-row >
<el-col :span="3.2" class="tleftb">
<span><span class="icon">*</span>仓库名称</span>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item prop="name"><el-input size="small" v-model="form.name" placeholder="仓库名称" class="addinputw" clearable /></el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>仓库简称</span>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item prop="name"><el-input size="small" v-model="form.name" placeholder="仓库简称" class="addinputw" clearable /></el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>仓库编码</span>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item prop="name"><el-input size="small" v-model="form.name" placeholder="仓库编码" class="addinputw" clearable /></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="3.2" class="tleftb">
<span><span class="icon">*</span>所属地&nbsp;&nbsp;&nbsp; </span>
</el-col>
<el-form-item prop="simpleName">
<el-select size="small" class = "arriveClass" v-model="form.region1" placeholder="请选择省" @change = "provinceChange($event)">
<el-option v-for="(item,index) in form.provinceList" :key="index" :label="item.name" :value="item.name">
</el-option>
</el-select>
<el-select size="small" class = "arriveClass" v-model="form.region2" placeholder="请选择市" @change = "cityChange($event)">
<el-option v-for="(item,index) in form.cityList" :key="index" :label="item.name" :value="item.name">
</el-option>
</el-select>
<el-select size="small" class = "arriveClass" v-model="form.region3" placeholder="请选择区县">
<el-option v-for="(item,index) in form.countyList" :key="index" :label="item.name" :value="item.name">
</el-option>
</el-select>
</el-form-item>
</el-row>
<el-row >
<el-col :span="3.2" class="tleftb">
<span><span class="icon">*</span>库房面积</span>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item prop="name"><el-input size="small" v-model="form.name" placeholder="库房面积" class="addinputw" clearable /></el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>库房高度</span>
</el-col>
<el-col :span="3" class="trightb">
<el-form-item prop="name"><el-input size="small" v-model="form.name" placeholder="库房高度" class="addinputw" clearable /></el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>月租金</span>
</el-col>
<el-col :span="3" class="trightb">
<el-form-item prop="name"><el-input size="small" v-model="form.name" placeholder="月租金" class="addinputw" clearable /></el-form-item>
</el-col>
</el-row>
<el-row >
<el-col :span="3.2" class="tleftb">
<span><span class="icon">*</span>库房性质编码</span>
</el-col>
<el-col :span="6" class="trightb">
<el-form-item prop="name">
<el-select size="small" class = "arriveClass" v-model="form.region1" placeholder="库房性质编码" @change = "provinceChange($event)">
<el-option v-for="(item,index) in form.provinceList" :key="index" :label="item.name" :value="item.name">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>房源</span>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item prop="name"><el-input size="small" v-model="form.name" placeholder="房源" class="addinputw" clearable /></el-form-item>
</el-col>
</el-row>
<el-row >
<el-col :span="3.2" class="tleftb">
<span><span class="icon">*</span>联系人姓名</span>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item prop="name"><el-input size="small" v-model="form.name" placeholder="联系人姓名" class="addinputw" clearable /></el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>联系人电话</span>
</el-col>
<el-col :span="3" class="trightb">
<el-form-item prop="name"><el-input size="small" v-model="form.name" placeholder="联系人电话" class="addinputw" clearable /></el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>附件</span>
</el-col>
<el-col :span="3" class="trightb">
<el-form-item prop="name"><el-input size="small" v-model="form.name" placeholder="附件" class="addinputw" clearable /></el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
@ -113,7 +213,24 @@ export default {
addr: [
{ required: true, message: '请输入仓库地址', trigger: 'blur' }
]
}
},
tableData:[],
totalPrice:0,
form:{
name:"",
region1:'',
region2:'',
region3:'',
xxarrive:'',
tel:'',
provinceList:[],
cityList:[],
countyList:[]
},
CITY:[],
XIAN:[],
mapApiKey: 'map',
shouhuoArrive:{}
}
},
methods: {
@ -132,9 +249,6 @@ export default {
this.total = result.data.total
this.storehouseList = result.data.rows
},
closeStorehouseDialog () {
this.$refs.storehouseRuleForm.resetFields()
},
addStorehouseDialog () {
this.title = '新增仓库'
this.storehouseDialogVisible = true
@ -180,13 +294,95 @@ export default {
if (resultDB.status !== 200) return this.$message.error('删除出库失败')
this.getStorehouseList()
this.$message.success('仓库删除成功')
}
},
getMap(){
this.$http({
method:"get",
url:"https://restapi.amap.com/v3/config/district?parameters", // apii
params:{ //
key:"3a708a4ef5e3af28694b1c861985a5ce", // key
keyWords:"中国",
subdistrict:3 //
}
}).then((res)=>{
this.form.provinceList = res.data.districts[0].districts /* 省*/
/* 进行遍历赋值*/
/* 市区和县区*/
let newProvince = this.form.provinceList
for(let i = 0; i < newProvince.length; i++){ /* 省级*/
for(let j = 0; j < newProvince[i].districts.length; j++){ /* 市级*/
let city = newProvince[i].districts[j].name
this.CITY.push({id:j+1,name:city,code:i+1})
for(let k = 0;k<newProvince[i].districts[j].districts.length; k++){/* 县级*/
let xian = newProvince[i].districts[j].districts[k].name
this.XIAN.push({id:k+1,name:xian,code:j+1,cityCountyName:city})
}
}
}
for(let m = 0; m < newProvince.length;m++){
newProvince[m] = {...newProvince[m],...{code:m+1}}
}
this.form.provinceList = newProvince
})
},
provinceChange(that){
//
this.form.region2=''
this.form.region3=''
let cityCode = 0
let newCityArry = []
this.form.provinceList.forEach((item,index)=>{
if(item.name == that){
cityCode = item.code
}
})
// console.log(cityCode)
if(cityCode){
this.form.cityList = []
this.CITY.forEach((item,index)=>{
if(item.code == cityCode){
this.form.cityList.push(item)
}
}) /* 市匹配成功*/
}
},
cityChange(that){
this.form.region3=''
let countyCode = 0
let cityname = ''
let newCountyArry = []
this.form.cityList.forEach((item,index)=>{
if(item.name == that){
countyCode = item.id
cityname = item.name
}
})
if(countyCode){
this.form.countyList = []
this.XIAN.forEach((item,index)=>{
if(item.code == countyCode && item.cityCountyName == cityname){
this.form.countyList.push(item)
}
})
}
},
},
mounted () {
this.getStorehouseList()
}
this.getMap()
},
}
</script>
<style>
.tleftb {
text-align: right;
font-size: 14px;
color: #606266;
line-height: 40px !important;
}
.trightb{ text-align: right;font-weight: bold;color: #606266; }
.tleft{ text-align: left; }
.arriveClass{margin-right: 30px;}
.icon{color:rgba(255, 0, 0, 0.553);margin-right: 3px;}
</style>

5
warehousing-system/project_web/src/plugins/element.js

@ -39,8 +39,8 @@ import {
Checkbox,
Upload,
Divider,
InputNumber
InputNumber,
footer
} from 'element-ui'
Vue.use(Button)
@ -81,6 +81,7 @@ Vue.use(Checkbox)
Vue.use(Upload)
Vue.use(Divider)
Vue.use(InputNumber)
Vue.use(footer)
// 将弹框组件挂载到Vue对象中 用户可以使用this关键字调用
Vue.prototype.$message = Message

8
yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/api/yxtdispatchcenter/dispatchmodletemplate.js

@ -55,5 +55,13 @@ export default {
method: 'post',
data: params
})
},
// 关联
save: function(params) {
return request({
url: '/yxtdispatchcenter/v1/dispatchmodletemplate/save',
method: 'post',
data: params
})
}
}

16
yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/api/yxtdispatchcenter/dispatchorderinfo.js

@ -71,5 +71,21 @@ export default {
method: 'post',
data: params
})
},
// 查询任务项列表信息
listPageA: function(params) {
return request({
url: '/yxtdispatchcenter/v1/dispatchorderstandards/listPage',
method: 'post',
data: params,
})
},
// 查询运维人员信息
listPageB: function(params) {
return request({
url: '/yxtdispatchcenter/v1/dispatchworker/listPage',
method: 'post',
data: params,
})
},
}

215
yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/components/AreaPicker/index.vue

@ -1,151 +1,154 @@
<template>
<div class="AreaPicker">
<el-select v-model="form.province"
<el-select
v-model="form.province"
@change="changeProvince(form.province)"
filterable
placeholder="请选择省份"
:loading="loading == 'province'">
:loading="loading == 'province'"
>
<el-option
v-for="item in province_list"
:key="item.sid"
:label="item.name"
:value="item.sid"
>
>
</el-option>
</el-select>
<el-select v-model="form.city"
@change='changeCity(form.city)'
<el-select
v-model="form.city"
@change="changeCity(form.city)"
filterable
placeholder="请选择市"
:loading="loading == 'city'"
style="margin-left: 8px;">
style="margin-left: 8px"
>
<el-option
v-for="item in city_list"
:key="item.sid"
:label="item.name"
:value="item.sid">
:value="item.sid"
>
</el-option>
</el-select>
<el-select v-model="form.county"
@change='changeCounty(form.county)'
<el-select
v-model="form.county"
@change="changeCounty(form.county)"
filterable
:loading="loading == 'county'"
placeholder="请选择县/区"
style="margin-left: 8px;">
style="margin-left: 8px"
>
<el-option
v-for="item in county_list"
:key="item.sid"
:label="item.name"
:value="item.sid">
:value="item.sid"
>
</el-option>
</el-select>
</div>
</template>
<script>
import {
getProvince,
getCity,
getCounty
} from '@/api/Common/areaPicker.js'
export default {
props:{
province:{
type: String,
default: ''
},
city:{
type: String,
default: ''
},
county:{
type: String,
default: ''
}
import { getProvince, getCity, getCounty } from "@/api/Common/areaPicker.js";
export default {
props: {
province: {
type: String,
default: "",
},
data() {
return {
province_list: [],
city_list: [],
county_list: [],
form:{
province: this.province,
city: this.city,
county: this.county
},
loading: false
}
city: {
type: String,
default: "",
},
watch:{
province:function(newVal,oldVal){
this.form.province = newVal
},
city:function(newVal,oldVal){
this.form.city = newVal
county: {
type: String,
default: "",
},
},
data() {
return {
province_list: [],
city_list: [],
county_list: [],
form: {
province: this.province,
city: this.city,
county: this.county,
},
county:function(newVal,oldVal){
this.form.county = newVal
}
loading: false,
};
},
watch: {
province: function (newVal, oldVal) {
this.form.province = newVal;
},
async mounted() {
let provincelist = await getProvince()
this.province_list = provincelist.data
if(this.province){
let citylist = await getCity({ sid: this.province })
this.city_list = citylist.data
}
if(this.city){
let countylist = await getCounty({ sid: this.city })
this.county_list = countylist.data
}
this.loading = false
city: function (newVal, oldVal) {
this.form.city = newVal;
},
methods: {
changeProvince(val){
console.log(val)
getCity({ sid: val }).then(res => {
this.city_list = res.data
this.loading = false
})
let obj = {};
obj = this.province_list.find((item)=>{
return item.sid === val;//
});
console.log(obj)
this.form.city = ''
this.form.county = ''
this.city_list = []
this.county_list = []
this.loading = 'city'
this.$emit('areaPicker', obj.sidPath)
},
changeCity(val){
let obj = {};
obj = this.city_list.find((item)=>{
return item.sid === val;//
});
console.log(obj)
this.form.county = ''
this.county_list = []
this.loading = 'county'
this.$emit('areaPicker', obj.sidPath)
getCounty({ sid: val }).then(res => {
this.county_list = res.data
this.loading = false
})
},
changeCounty(val){
let obj = {};
obj = this.county_list.find((item)=>{
return item.sid === val;//
});
this.$emit('areaPicker', obj.sidPath)
}
county: function (newVal, oldVal) {
this.form.county = newVal;
},
},
async mounted() {
let provincelist = await getProvince();
this.province_list = provincelist.data;
if (this.province) {
let citylist = await getCity({ sid: this.province });
this.city_list = citylist.data;
}
}
if (this.city) {
let countylist = await getCounty({ sid: this.city });
this.county_list = countylist.data;
}
this.loading = false;
},
methods: {
changeProvince(val) {
console.log(val);
getCity({ sid: val }).then((res) => {
this.city_list = res.data;
this.loading = false;
});
let obj = {};
obj = this.province_list.find((item) => {
return item.sid === val; //
});
console.log(obj);
this.form.city = "";
this.form.county = "";
this.city_list = [];
this.county_list = [];
this.loading = "city";
this.$emit("areaPicker", obj.sidPath);
},
changeCity(val) {
let obj = {};
obj = this.city_list.find((item) => {
return item.sid === val; //
});
console.log(obj);
this.form.county = "";
this.county_list = [];
this.loading = "county";
this.$emit("areaPicker", obj.sidPath);
getCounty({ sid: val }).then((res) => {
this.county_list = res.data;
this.loading = false;
});
},
changeCounty(val) {
let obj = {};
obj = this.county_list.find((item) => {
return item.sid === val; //
});
this.$emit("areaPicker", obj.sidPath);
},
},
};
</script>
<style>
</style>

28
yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchmodletemplate/dispatchmodletemplate.vue

@ -160,7 +160,6 @@ export default {
taskid: '' // id
}
},
multipleSelection: [],
btnList: [
{
type: 'primary',
@ -190,7 +189,10 @@ export default {
tasktypeparent: '' // +
}
},
multipleSelection:[]
UseList:{
templateid:'',
taskid:[]
}
}
},
mounted() {
@ -324,7 +326,7 @@ export default {
})
},
handleSelectionChange(val) {
this.multipleSelection = val
this.UseList.taskid = val
},
//
indexMethod(index) {
@ -343,6 +345,7 @@ export default {
toMaintain(row){
this.loadLists()
this.dialogVisible=true
this.UseList.templateid=row.templateid
},
formatPrivilegeType: function( row, column) {
if(row.taskreturn === '1'){
@ -356,10 +359,25 @@ export default {
}
},
confirm(){
if (this.multipleSelection.length === 0) {
this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行编辑' })
if (this.UseList.taskid.length === 0) {
this.$message({ showClose: true, type: 'error', message: '请至少选择一条记录进行关联' })
return
}
let arrList=[]
this.UseList.taskid.forEach(item=>{
arrList.push(item.sid)
})
console.log(arrList);
this.UseList.taskid=arrList
req.save(this.UseList).then((res)=>{
if (res.success) {
this.$message({ type: 'success', message: res.msg, showClose: true })
this.dialogVisible=false
} else {
// resp.code
}
})
}
}
}

44
yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchorderinfo/dispatchorderinfoAdd.vue

@ -20,7 +20,7 @@
<el-form v-show="isSearchShow" ref="form_obj" :model="formobj" :rules="rules" label-position="right" class="demo-form-inline">
<div class="listtop">
<div class="tit">巡视工单信息</div>
</div>
</div>
<el-row>
<el-col :span="2" class="tleftb">
<span><span class="icon">*</span>客户名称</span>
@ -60,7 +60,7 @@
v-for="(item, i) in dataList"
:key="i"
:label="item.templateid"
:value="item.taskid"
:value="item.templateid"
/>
</el-select>
</el-col>
@ -161,9 +161,9 @@
<div>
<el-table :data="list" border style="width: 100%;text-align: center;">
<el-table-column fixed width="100" type="index" label="序号" align="center" />
<el-table-column prop="taskid" width="200" label="设备类别" align="center" />
<el-table-column prop="templateid" label="任务模板名称" width="200" align="center" />
<el-table-column prop="c" label="巡视内容" align="center" />
<el-table-column prop="tasktype" width="200" label="设备类别" align="center" />
<el-table-column prop="taskname" label="任务模板名称" width="200" align="center" />
<el-table-column prop="taskdesc" label="巡视内容" align="center" />
</el-table>
</div>
</div>
@ -227,6 +227,14 @@ export default {
taskid: ''
}
},
queryParamsA: {
current: 1,
size: 10,
total: 0,
params: {
orderId:''
}
},
}
},
mounted(){
@ -234,7 +242,6 @@ export default {
if (resp.success) {
const data = resp.data
this.dataList = data.records
this.list = data.records
}
})
},
@ -258,7 +265,7 @@ export default {
this.formobj.operationcontent = '' //
this.formobj.receiveperson = '' //
this.formobj.receivetel = '' //
this.queryParamsA.params.orderId=''
this.$refs['form_obj'].resetFields()
this.$emit('doback')
},
@ -276,6 +283,7 @@ export default {
this.$refs['form_obj'].clearValidate()
})
this.viewTitle = '【新增】工单数据'
this.ShowList()
},
showEdit(row) {
this.$nextTick(() => {
@ -310,6 +318,9 @@ export default {
.catch(e => {
this.formobj = row
})
this.queryParamsA.params.orderId=row.sid
this.ShowList()
this.ShowYunwei()
},
saveOrUpdate() {
if (this.formobj.workers.length === 0) {
@ -327,6 +338,7 @@ export default {
if (resp.success) {
_this.$message({ showClose: true, type: 'success', message: resp.msg })
_this.handleReturn('true')
_this.queryParamsA.params.orderId=''
} else {
// resp.code
}
@ -362,9 +374,21 @@ export default {
}).then(() => {
this.TabList.splice(index, 1);
})
},
}
}
},
//
ShowYunwei(){
req.listPageB(this.queryParamsA).then((res)=>{
console.log(res);
})
},
//
ShowList(){
req.listPageA(this.queryParamsA).then((res)=>{
this.list = res.data.records
})
},
}
}
</script>
<style scoped></style>

143
yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchorderinfo/dispatchpatrolplanAdds.vue

@ -130,17 +130,40 @@
</div>
<div class="listtop">
<div class="tit">巡视人员</div>
<el-button class="span" type="primary" @click.stop="add()">新增</el-button>
</div>
<div>
<el-table ref="table" tooltip-effect="dark" :data="TabList" border style="width: 100%"
@selection-change="handleSelectionChange" @select="handleSelection" stripe>
<el-table ref="table" tooltip-effect="dark" :data="TabList" border style="width: 100%"
@selection-change="handleSelectionChange" stripe >
>
<el-table-column type="selection" width="55"/>
<el-table-column fixed width="100" type="index" label="序号" align="center" />
<el-table-column prop="principalname" label="巡视人名称" align="center" />
<el-table-column prop="principalcontact" label="联系方式" align="center" />
<el-table-column prop="workteam" label="班组组织" align="center" />
<el-table-column prop="executorname" label="是否负责人" width="150px" align="center" />
<el-table-column label="操作" wid align="center" width="150">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="doCommoditylDel(scope.$index)">删除</el-button>
</template>
</el-table-column>
<el-table-column prop="principalname" label="巡视人名称" align="center" >
<template slot-scope="scope">
<el-input v-model="scope.row.principalname" placeholder="" clearable></el-input>
</template>
</el-table-column>
<el-table-column prop="principalcontact" label="联系方式" align="center" >
<template slot-scope="scope">
<el-input v-model="scope.row.principalcontact" placeholder="" clearable></el-input>
</template>
</el-table-column>
<el-table-column prop="workteam" label="班组组织" align="center" >
<template slot-scope="scope">
<el-input v-model="scope.row.workteam" placeholder="" clearable></el-input>
</template>
</el-table-column>
<el-table-column prop="executorname" label="是否负责人" width="150px" align="center" >
<template slot-scope="scope">
<el-radio v-model="scope.row.executorname" label="是"></el-radio>
<el-radio v-model="scope.row.executorname" label="否"></el-radio>
</template>
</el-table-column>
</el-table>
</div>
<div class="listtop">
@ -149,9 +172,9 @@
<div>
<el-table :data="list" border style="width: 100%;text-align: center;">
<el-table-column fixed width="100" type="index" label="序号" align="center" />
<el-table-column prop="a" width="200" label="设备类别" align="center" />
<el-table-column prop="b" label="任务模板名称" width="200" align="center" />
<el-table-column prop="c" label="巡视内容" align="center" />
<el-table-column prop="tasktype" width="200" label="设备类别" align="center" />
<el-table-column prop="taskname" label="任务模板名称" width="200" align="center" />
<el-table-column prop="taskdesc" label="巡视内容" align="center" />
</el-table>
</div>
</div>
@ -162,6 +185,7 @@
<script>
import req from '@/api/yxtdispatchcenter/dispatchpatrolplan'
import req2 from '@/api/yxtdispatchcenter/dispatchmodletemplate'
import req3 from '@/api/yxtdispatchcenter/dispatchorderinfo'
export default {
name: 'DispatchPatrolPlanAdd',
data() {
@ -190,35 +214,8 @@ export default {
workers:[],
},
dataList:[],
TabList:[{
principalname:'1',//
principalsid:'1',//sid
principalcontact:'1',//
executorname:'1',//
executornamekey:'1',//key
workteam:'1',//
workteamid:'110',//id
},{
principalname:'1',//
principalsid:'1',//sid
principalcontact:'1',//
executorname:'1',//
executornamekey:'1',//key
workteam:'1',//
workteamid:'110',//id
}],
list:[
{
a:'变压器',
b:'变压器巡视',
c:'设备类型占位符_巡视标准占位符占位符占位符占位符占位符占位符占位符',
},
{
a:'感应器',
b:'感应器巡视',
c:'设备类型占位符_巡视标准占位符',
},
],
TabList:[],
list:[],
rules: {
planname: [{ required: true, message: '计划名称不能为空', trigger: 'blur' }], //
custname: [{ required: true, message: '客户标识不能为空', trigger: 'blur' }], //
@ -245,6 +242,14 @@ export default {
taskid: ''
}
},
queryParamsA: {
current: 1,
size: 10,
total: 0,
params: {
orderId:''
}
},
}
},
mounted(){
@ -261,21 +266,21 @@ export default {
if (isreload === 'true') this.$emit('reloadlist')
this.formobj.id = ''
this.formobj.sid = '' // SID
this.planname = '' //
this.custname = '' //
this.custid = '' // ID
this.supervisesid = '' // id
this.patroltype = '' // 12
this.startdate = '' //
this.enddate = '' //
this.contactperson = '' //
this.contactphone = '' //
this.planno = '' //
this.templateid = '' // id
this.cycletype = '' // ()
this.cycle = '' //
this.cyclevalue = '' //
this.formobj.planname = '' //
this.formobj.custname = '' //
this.formobj.custid = '' // ID
this.formobj.supervisesid = '' // id
this.formobj.patroltype = '' // 12
this.formobj.startdate = '' //
this.formobj.enddate = '' //
this.formobj.contactperson = '' //
this.formobj.contactphone = '' //
this.formobj.planno = '' //
this.formobj.templateid = '' // id
this.formobj.cycletype = '' // ()
this.formobj.cycle = '' //
this.formobj.cyclevalue = '' //
this.queryParamsA.params.orderId=''
this.$refs['form_obj'].resetFields()
this.$emit('doback')
},
@ -293,6 +298,7 @@ export default {
this.$refs['form_obj'].clearValidate()
})
this.viewTitle = '【新增】计划'
this.ShowList()
},
showEdit(row) {
this.$nextTick(() => {
@ -329,6 +335,8 @@ export default {
.catch(e => {
this.formobj = row
})
this.queryParamsA.params.orderId=row.sid
this.ShowList()
},
saveOrUpdate() {
if (this.formobj.workers.length === 0) {
@ -346,6 +354,7 @@ export default {
if (resp.success) {
_this.$message({ showClose: true, type: 'success', message: resp.msg })
_this.handleReturn('true')
_this.queryParamsA.params.orderId=''
} else {
// resp.code
}
@ -358,6 +367,21 @@ export default {
}
})
},
add() {
this.TabList.push({
})
},
doCommoditylDel(index) {
const tip = '请确认是否删除所选记录?'
this.$confirm(tip, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.TabList.splice(index, 1);
})
},
handleSelectionChange(val) {
this.formobj.workers = val;
},
@ -366,7 +390,18 @@ export default {
let del_row = selection.shift();
this.$refs.table.toggleRowSelection(del_row, false)
}
}
},
//
ShowYunwei(){
req3.listPageB(this.queryParamsA).then((res)=>{
console.log(res);
})
},
ShowList(){
req3.listPageA(this.queryParamsA).then((res)=>{
this.list = res.data.records
})
},
}
}
</script>

3
yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchworker/dispatchworker.vue

@ -52,7 +52,7 @@
<el-tooltip class="item" effect="dark" content="编辑" placement="top-end">
<i class="el-icon-edit-outline" @click="toEdit(scope.row)"></i>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="查看" placement="top-start">
<el-tooltip class="item" effect="dark" content="生成工单" placement="top-start">
<i class="el-icon-notebook-2" @click="purchase(scope.row)"></i>
</el-tooltip>
</template>
@ -437,6 +437,7 @@ export default {
},
purchase(row){
this.drawer=true
this.formobj = Object.assign({}, row);
},
}
}

Loading…
Cancel
Save