wangyifang
/
patrol-wzgl-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

调整

Browse Source
master
lion 3 months ago
parent ebbe4ea4e8
commit 134c5a62bf
14 changed files with 64 additions and 39 deletions
Show Stats Download Patch File Download Diff File

12
.env.development
Unescape View File

@ -1,16 +1,16 @@
# just a flag
ENV='development'
VUE_APP_BASE_API = http://192.168.60.99:8004/
VUE_APP_UPLOAD_API = http://192.168.60.99:8004/api/admin/upload-file
VUE_APP_OA_URL= http://192.168.60.18:8001
VUE_APP_OA_URL_TYPE = '{"采购入库":51,"请示入库":54,"调拨入库":55,"领用出库":56,"处置出库":57,"调拨出库":53}'
#VUE_APP_BASE_API = http://192.168.60.99:8004/
#VUE_APP_UPLOAD_API = http://192.168.60.99:8004/api/admin/upload-file
#VUE_APP_OA_URL= http://192.168.60.18:8001
#VUE_APP_OA_URL_TYPE = '{"采购入库":51,"请示入库":54,"调拨入库":55,"领用出库":56,"处置出库":57,"调拨出库":53}'
#正式
#VUE_APP_BASE_API = http://192.168.60.99:9004/
#VUE_APP_UPLOAD_API = http://192.168.60.99:9004/api/admin/upload-file
VUE_APP_BASE_API = http://192.168.60.99:9004/
VUE_APP_UPLOAD_API = http://192.168.60.99:9004/api/admin/upload-file
# 正式oa
VUE_APP_OA_URL = http://192.168.60.18:2021

10
public/print.html
Unescape View File

@ -58,19 +58,19 @@
var gudingzichanbianma = printObj['gudingzichanbianma']? printObj['gudingzichanbianma']:''
$(".wrap").append("<li id='page" + index + "' style='width: 9cm; height: 5cm;font-size: 16px;font-weight:bold;background-color: #fff;'>" +
"<p style='text-align:center;margin-bottom:0;padding-top:5px;'><span style='text-align:left;display:inline-block;width:2cm'>"+printDate+"</span>"+
"<span style='text-align:left;display:inline-block;width:2cm'>"+chanquan+"</span></p>"+
"<p style='text-align:center;margin-bottom:0;padding-top:5px;'><span style='text-align:left;display:inline-block;width:3cm'>"+printDate+"</span>"+
"<span style='text-align:left;display:inline-block;width:6cm'>"+chanquan+"</span></p>"+
"<div style='padding:5px 15px;'>"+
"<img src='"+printObj['path']+"' style='width:3cm; height:3cm;display: inline-block'>"+
"<div style='display:inline-block;vertical-align: top;width:170px'>"+
"<div style='display:inline-block;vertical-align: top;width:170px;font-size:14px'>"+
"<p style='margin:0'>类别:"+printObj['material_info_type']+"</p>"+
"<p style='margin:0'>规格:"+guige+"</p>"+
"<p style='margin:0'>型号:"+xinghao+"</p>"+
"<p style='margin:0'><span>批次:"+printObj['rukupici']+"</span><span>数量：</span>"+printObj['total_num']+"</p>"+
"<p style='margin:0'><span>批次:"+printObj['rukupici']+"</span><span>数量:</span>"+printObj['total_num']+"</p>"+
"<p style='margin:0'>批内序号:"+shunxuhao+"</p>"+
"</div>"+
"</div>"+
"<p style='padding:15px;padding-top:0;margin:0;text-align:left'>"+gudingzichanbianma?'固定资产编码：'+gudingzichanbianma:''"</p>"+
"<p style='padding:15px;padding-top:0;margin:0;text-align:left'>"+(gudingzichanbianma?'固定资产编码：'+gudingzichanbianma:'')+"</p>"+
"</li>")
// createCode("#page" + index, printObj)

11
src/views/books/components/addBook.vue
Unescape View File

@ -48,6 +48,16 @@
</div>
</div>
</template>
<template v-slot:nianling>
<div class="xy-table-item">
<div class="xy-table-item-label">
<span style="color: red;font-weight: 600;padding-right: 4px;" />年龄：
</div>
<div class="xy-table-item-content">
<el-input v-model="form.nianling" style="width:300px" />
</div>
</div>
</template>
<template v-slot:gongzhong>
<div class="xy-table-item">
<div class="xy-table-item-label">
@ -96,6 +106,7 @@ export default {
suozaiduiwu: '',
xingming: '',
lianxidianhua: '',
nianling:'',
gongzhong: '',
beizhu: ''
},

2
src/views/component/imports.vue
Unescape View File

@ -57,7 +57,7 @@ export default {
},
data() {
return {
action: `${process.env.VUE_APP_BASE_API}api/admin/base-form/excel-show`,
action: `${process.env.VUE_APP_BASE_API}/api/admin/base-form/excel-show`,
dialogVisible: false,
headers: [],

4
src/views/inventorys/stocktaking.vue
Unescape View File

@ -314,10 +314,10 @@
<span class="label">物资名称：</span>
<span class="value">{{ detailModal.data.material_info && detailModal.data.material_info.zichanmingcheng || '-' }}</span>
</div>
<div class="info-item">
<!-- <div class="info-item">
<span class="label">物资代码：</span>
<span class="value">{{ detailModal.data.material_info && detailModal.data.material_info.wuzibianma || '-' }}</span>
</div>
</div> -->
<div class="info-item">
<span class="label">物资型号：</span>
<span class="value">{{ detailModal.data.material_info && detailModal.data.material_info.guigexinghao || '-' }}</span>

10
src/views/maintenance/maintenance_records.vue
Unescape View File

@ -513,11 +513,11 @@ export default {
key: 'zichanmingcheng',
minWidth: 120
},
{
title: '物资代码',
key: 'wuzibianma',
minWidth: 120
},
// {
// title: '物资代码',
// key: 'wuzibianma',
// minWidth: 120
// },
{
title: '物资型号',
key: 'guigexinghao',

10
src/views/maintenance/maintenance_rules.vue
Unescape View File

@ -288,11 +288,11 @@ export default {
key: 'zichanmingcheng',
minWidth: 120
},
{
title: '物资代码',
key: 'wuzibianma',
minWidth: 120
},
// {
// title: '物资代码',
// key: 'wuzibianma',
// minWidth: 120
// },
{
title: '物资型号',
key: 'guigexinghao',

1
src/views/outbounds/component/addoutbounds.vue
Unescape View File

@ -29,6 +29,7 @@
type="date"
placeholder="选择日期"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
/>
</div>
</div>

6
src/views/outbounds/component/printoutbounds.vue
Unescape View File

@ -34,8 +34,8 @@
<td>{{ item.wuzileixing==='一物一码'?item.inventorys.length:item.jieyongshuliang }}</td>
<td>{{ item.wuziguige }}</td>
<td>{{ item.guigexinghao }}</td>
<td v-if="isChange" @click="changeWz(item)">
<el-button size="small" type="primary">更改出库序号</el-button>
<td v-if="isChange">
<el-button @click="changeWz(item)" v-if="item.wuzileixing==='一物一码'" size="small" type="primary">更改出库序号</el-button>
</td>
</tr>
<tr>
@ -381,7 +381,7 @@ export default {
},
mingxiCancel(){
this.mingxiObj = {}
this.mingxiList = []
// this.mingxiList = []
this.isShowMingxi = false
},
replaceAndSplit(mergedArr, mingxiObj) {

4
src/views/stocks/component/addRuku.vue
Unescape View File

@ -41,7 +41,7 @@
</el-select>
</el-form-item>
<el-form-item label="入库日期" prop="rukushijian">
<el-date-picker v-model="form.rukushijian" type="date" placeholder="选择入库日期" value-format="yyyy-MM-dd"
<el-date-picker v-model="form.rukushijian" type="date" format="yyyy-MM-dd" placeholder="选择入库日期" value-format="yyyy-MM-dd"
style="width: 100%;" />
</el-form-item>
<el-form-item label="经办人" prop="jingbanren">
@ -70,7 +70,7 @@
<div v-show="activeStep === 1">
<div class="operation-bar" style="margin-bottom: 20px;">
<el-button size="mini" type="primary" @click="addStockItems">添加物资明细</el-button>
<!-- <el-button size="mini" type="primary" @click="importsRuku">导入</el-button> -->
<el-button size="mini" type="primary" @click="importsRuku">导入</el-button>
</div>
<xy-table style="width: 100%" :height="260" :is-page="false" :list="mingxiList" :table-item="mingxiTable">
<template v-slot:btns>

2
src/views/stocks/component/showRuku.vue
Unescape View File

@ -283,7 +283,7 @@
baoguanrenyuan: res?.baoguanrenyuan,
beizhu: res?.beizhu,
zuozhengwenjian: res?.zuozhengwenjian,
rukutupian:res?.rukutupian
rukutupian:res?.rukutupian,
}
this.form.id = this.id
this.form.zhuangtai = res.zhuangtai?res.zhuangtai:0

6
src/views/team/components/addTeam.vue
Unescape View File

@ -89,7 +89,7 @@
</div>
</div>
</template>
<template v-slot:quyu>
<!-- <template v-slot:quyu>
<div class="xy-table-item">
<div class="xy-table-item-label">
<span style="color: red;font-weight: 600;padding-right: 4px;" />区域：
@ -98,7 +98,7 @@
<el-input v-model="form.quyu" style="width: 300px;" />
</div>
</div>
</template>
</template> -->
<template v-slot:dizhi>
<div class="xy-table-item">
<div class="xy-table-item-label">
@ -168,7 +168,7 @@ export default {
duizhang: '',
lianxidianhua: '',
renshu: '',
quyu: '',
// quyu: '',
dizhi: '',
jingdu: '',
weidu: '',

13
src/views/team/components/showTeam.vue
Unescape View File

@ -65,12 +65,23 @@ export default {
}, {
label: '所在队伍',
prop: 'suozaiduiwu',
align: 'left'
align: 'left',
minWidth:240
}, {
label: '姓名',
prop: 'xingming',
align: 'left',
width: 120
}, {
label: '年龄',
prop: 'nianling',
align: 'left',
width: 120
}, {
label: '工种',
prop: 'gongzhong',
align: 'left',
width: 120
}, {
label: '联系电话',
prop: 'lianxidianhua',

12
src/views/team/team.vue
Unescape View File

@ -128,11 +128,13 @@ export default {
label: '人数',
prop: 'renshu',
width: 120
}, {
label: '区域',
prop: 'quyu',
width: 120
}, {
},
// {
// label: '区域',
// prop: 'quyu',
// width: 120
// },
{
label: '地址',
prop: 'dizhi',
width: 120

Write Preview
Loading…
Cancel
Save