Merge branch 'dev-yjl' into 'shenzhen-dev'
中建五局导出/材料管理-设备管理/中建四大屏修改 See merge request !151
This commit is contained in:
袁晶琳
commit
119c52b732
@ -15,8 +15,6 @@ COMPANY = 'zjwj'//中建五局
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
var PROJECT = {
|
||||
local_test: 'common', // 普通版
|
||||
online_hq: 'hengqin', // 横琴
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 19 MiB After Width: | Height: | Size: 64 MiB |
@ -61,4 +61,31 @@ export const gettGMaterialContractArrivalAcceptancePageApi = data => get('/xmgl/
|
||||
export const addGtMaterialSupplierEvaluationRecordApi = data => post('/xmgl/gt/gtMaterialSupplierEvaluationRecord/add', data);
|
||||
export const deletGtMaterialSupplierEvaluationRecordApi = data => post('/xmgl/gt/gtMaterialSupplierEvaluationRecord/delete', data);
|
||||
export const editGtMaterialSupplierEvaluationRecordApi = data => post('/xmgl/gt/gtMaterialSupplierEvaluationRecord/edit', data);
|
||||
export const gettGMaterialSupplierEvaluationRecordPageApi = data => get('/xmgl/gt/gtMaterialSupplierEvaluationRecord/page', data);
|
||||
export const gettGMaterialSupplierEvaluationRecordPageApi = data => get('/xmgl/gt/gtMaterialSupplierEvaluationRecord/page', data);
|
||||
|
||||
//出入库管理_
|
||||
|
||||
export const addGtMaterialInOutWarehouseApi = data => post('/xmgl/gt/gtMaterialInOutWarehouse/add', data);
|
||||
export const deletGtMaterialInOutWarehouseApi = data => post('/xmgl/gt/gtMaterialInOutWarehouse/delete', data);
|
||||
export const editGtMaterialInOutWarehouseApi = data => post('/xmgl/gt/gtMaterialInOutWarehouse/edit', data);
|
||||
export const gettGMaterialInOutWarehouseAPageApi = data => get('/xmgl/gt/gtMaterialInOutWarehouse/page', data);
|
||||
|
||||
|
||||
|
||||
//设备管理_自有设备管理
|
||||
export const addGtMaterialDeviceApi = data => post('/xmgl/gt/gtMaterialDevice/add', data);
|
||||
export const deletGtMaterialDeviceApi = data => post('/xmgl/gt/gtMaterialDevice/delete', data);
|
||||
export const editGtMaterialDeviceApi = data => post('/xmgl/gt/gtMaterialDevice/edit', data);
|
||||
export const gettGMaterialDevicePageApi = data => get('/xmgl/gt/gtMaterialDevice/page', data);
|
||||
|
||||
//设备管理_自有设备管理_维保记录
|
||||
export const addGMaterialDeviceMaintenanceRecordApi = data => post('/xmgl/gt/gtMaterialDeviceMaintenanceRecord/add', data);
|
||||
export const deletGtMaterialDeviceMaintenanceRecordApi = data => post('/xmgl/gt/gtMaterialDeviceMaintenanceRecord/delete', data);
|
||||
export const editGtMaterialDeviceMaintenanceRecordApi = data => post('/xmgl/gt/gtMaterialDeviceMaintenanceRecord/edit', data);
|
||||
export const gettGMaterialDeviceMaintenanceRecordApi = data => get('/xmgl/gt/gtMaterialDeviceMaintenanceRecord/list', data);
|
||||
|
||||
//设备管理_自有设备管理_强制检验记录
|
||||
export const addGMaterialDeviceMandatoryInspectionRecordApi = data => post('/xmgl/gt/gtMaterialDeviceMandatoryInspectionRecord/add', data);
|
||||
export const deletGtMaterialDeviceMandatoryInspectionRecordApi = data => post('/xmgl/gt/gtMaterialDeviceMandatoryInspectionRecord/delete', data);
|
||||
export const editGtMaterialDeviceMandatoryInspectionRecordApi = data => post('/xmgl/gt/gtMaterialDeviceMandatoryInspectionRecord/edit', data);
|
||||
export const gettGMaterialDeviceMandatoryInspectionRecordApi = data => get('/xmgl/gt/gtMaterialDeviceMandatoryInspectionRecord/list', data);
|
||||
@ -80,8 +80,8 @@ if (process.env.NODE_ENV == 'development') {
|
||||
// axios.defaults.baseURL = 'http://192.168.34.221:12346' //郭圣雄本地
|
||||
// axios.defaults.baseURL = 'http://192.168.34.221:12350' //金林湾本地
|
||||
// axios.defaults.baseURL = 'http://192.168.34.122:8070' //彭洁本地
|
||||
axios.defaults.baseURL = 'http://192.168.34.221:8070' //演示平台郭圣雄本地
|
||||
// axios.defaults.baseURL = 'http://192.168.34.221:30000' //中建五局郭圣雄本地
|
||||
// axios.defaults.baseURL = 'http://192.168.34.221:8070' //演示平台郭圣雄本地
|
||||
axios.defaults.baseURL = 'http://192.168.34.221:30000' //中建五局郭圣雄本地
|
||||
// axios.defaults.baseURL = 'http://101.43.164.214:11111' //百色线上
|
||||
// axios.defaults.baseURL = 'http://101.43.164.214:12345/'//内蒙古线上
|
||||
// axios.defaults.baseURL = 'http://121.196.214.246/api/'//金林湾线上新
|
||||
|
||||
@ -152,7 +152,7 @@ export default {
|
||||
},{
|
||||
name: "监控统计"
|
||||
},{
|
||||
name: "报表导出"
|
||||
name: "报表"
|
||||
},{
|
||||
name: "设备管理"
|
||||
}
|
||||
|
||||
@ -87,10 +87,10 @@ export default new Vuex.Store({
|
||||
// FILEURL:'http://'+"47.97.202.104:6023"+'/image/',//正式
|
||||
// UPLOADURL: 'http://182.90.224.147:100/upload/image',//演示平台
|
||||
// FILEURL: 'http://182.90.224.147:100/image/',//演示平台
|
||||
UPLOADURL: 'http://192.168.34.221:8070/upload/image',//演示平台郭圣雄本地
|
||||
FILEURL: 'http://192.168.34.221:8070/image/',//演示平台郭圣雄本地
|
||||
// UPLOADURL: 'http://192.168.34.221:30000/upload/image',//郭圣雄本地
|
||||
// FILEURL: 'http://192.168.34.221:30000/image/',//郭圣雄本地
|
||||
// UPLOADURL: 'http://192.168.34.221:8070/upload/image',//演示平台郭圣雄本地
|
||||
// FILEURL: 'http://192.168.34.221:8070/image/',//演示平台郭圣雄本地
|
||||
UPLOADURL: 'http://192.168.34.221:30000/upload/image',//郭圣雄本地
|
||||
FILEURL: 'http://192.168.34.221:30000/image/',//郭圣雄本地
|
||||
// UPLOADURL: 'http://101.43.164.214:12345/upload/image',//内蒙古
|
||||
// FILEURL: 'http://101.43.164.214:12345/image/',//内蒙古
|
||||
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
<div class="rowInfo">
|
||||
<!-- <span class="point"></span> -->
|
||||
<span>混凝土浇筑总量</span>
|
||||
<span style="color: #5ec2c8">20058.5m³</span>
|
||||
<span style="color: #5ec2c8">21187.78m³</span>
|
||||
<!-- 2022年总量 -->
|
||||
<!-- <span style="color: #5ec2c8">13150.5m³</span> -->
|
||||
</div>
|
||||
@ -43,6 +43,51 @@ export default {
|
||||
data() {
|
||||
return {
|
||||
dataList: [
|
||||
{
|
||||
date: '2023/4/18',
|
||||
building: '二层核心筒梁板 ',
|
||||
quantity: 32.5
|
||||
},
|
||||
{
|
||||
date: '2023/4/18',
|
||||
building: '二层核心筒梁板 ',
|
||||
quantity: 32.5
|
||||
},
|
||||
{
|
||||
date: '2023/4/18',
|
||||
building: '首层核心筒5.5-9.93标高段墙柱 ',
|
||||
quantity: 247
|
||||
},
|
||||
{
|
||||
date: '2023/4/18',
|
||||
building: '首层核心筒5.5-9.93标高段墙柱 ',
|
||||
quantity: 247
|
||||
},
|
||||
{
|
||||
date: '2023/4/13',
|
||||
building: '负三层外墙后浇带',
|
||||
quantity: 5
|
||||
},
|
||||
{
|
||||
date: '2023/4/13',
|
||||
building: '负三层外墙后浇带',
|
||||
quantity: 5
|
||||
},
|
||||
{
|
||||
date: '2023/4/13',
|
||||
building: '负三层外墙后浇带',
|
||||
quantity: 5
|
||||
},
|
||||
{
|
||||
date: '2023/4/11',
|
||||
building: '首层核心筒5.5米剪力墙柱',
|
||||
quantity: 277.64
|
||||
},
|
||||
{
|
||||
date: '2023/4/11',
|
||||
building: '首层核心筒5.5米剪力墙柱',
|
||||
quantity: 277.64
|
||||
},
|
||||
{
|
||||
date: '2023/3/26',
|
||||
building: '1-4轴×C-K轴首层梁板',
|
||||
@ -679,7 +724,7 @@ export default {
|
||||
},
|
||||
series: [
|
||||
{
|
||||
data: [3589, 311.5, 3007.5, 0, 0, 0, 0, 0, 0, 0, 0, 0],
|
||||
data: [3589, 311.5, 3007.5, 1129.28, 0, 0, 0, 0, 0, 0, 0, 0],
|
||||
type: 'line',
|
||||
smooth: true,
|
||||
color: '#f56c35'
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -9,46 +9,37 @@
|
||||
size="medium"
|
||||
>
|
||||
<el-form-item label="单号">
|
||||
<el-input
|
||||
v-model="searchForm.warehouseName"
|
||||
placeholder="请输入"
|
||||
></el-input>
|
||||
<el-input v-model="searchForm.number" placeholder="请输入"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="货号">
|
||||
<el-input
|
||||
v-model="searchForm.warehouseName"
|
||||
placeholder="请输入"
|
||||
></el-input>
|
||||
<el-input v-model="searchForm.test1" placeholder="请输入"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="仓库">
|
||||
<el-input
|
||||
v-model="searchForm.warehouseName"
|
||||
v-model="searchForm.warehouse"
|
||||
placeholder="请输入"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="部门">
|
||||
<el-input
|
||||
v-model="searchForm.warehouseName"
|
||||
v-model="searchForm.department"
|
||||
placeholder="请输入"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="类型">
|
||||
<el-input
|
||||
v-model="searchForm.warehouseName"
|
||||
v-model="searchForm.category"
|
||||
placeholder="请输入"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="经手人">
|
||||
<el-input
|
||||
v-model="searchForm.warehouseName"
|
||||
v-model="searchForm.handler"
|
||||
placeholder="请输入"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="助查码">
|
||||
<el-input
|
||||
v-model="searchForm.warehouseName"
|
||||
placeholder="请输入"
|
||||
></el-input>
|
||||
<el-input v-model="searchForm.test2" placeholder="请输入"></el-input>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="日期">
|
||||
@ -62,10 +53,7 @@
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item label="供货单位">
|
||||
<el-input
|
||||
v-model="searchForm.warehouseName"
|
||||
placeholder="请输入"
|
||||
></el-input>
|
||||
<el-input v-model="searchForm.vendor" placeholder="请输入"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button type="primary" plain @click="getList">{{
|
||||
@ -79,64 +67,64 @@
|
||||
</el-form>
|
||||
</div>
|
||||
<div class="table_wrap whiteBlock">
|
||||
<el-table class="tables" :data="List">
|
||||
<el-table class="tables" :data="List" @row-click="showDetailFn">
|
||||
<el-table-column
|
||||
prop="warehouseName"
|
||||
prop="serialNumber"
|
||||
label="编号"
|
||||
align="center"
|
||||
></el-table-column>
|
||||
<el-table-column
|
||||
prop="warehousePos"
|
||||
prop="number"
|
||||
align="center"
|
||||
label="单号"
|
||||
></el-table-column>
|
||||
<el-table-column
|
||||
prop="header"
|
||||
prop="date"
|
||||
align="center"
|
||||
label="日期"
|
||||
></el-table-column>
|
||||
<el-table-column
|
||||
prop="headerPhone"
|
||||
prop="warehouse"
|
||||
align="center"
|
||||
label="仓库"
|
||||
></el-table-column>
|
||||
<el-table-column
|
||||
prop="headerPhone"
|
||||
prop="direction"
|
||||
align="center"
|
||||
label="方向"
|
||||
></el-table-column>
|
||||
<el-table-column
|
||||
prop="headerPhone"
|
||||
prop="category"
|
||||
align="center"
|
||||
label="类别"
|
||||
></el-table-column>
|
||||
<el-table-column
|
||||
prop="headerPhone"
|
||||
prop="department"
|
||||
align="center"
|
||||
label="部门"
|
||||
></el-table-column>
|
||||
<el-table-column
|
||||
prop="headerPhone"
|
||||
prop="vendor"
|
||||
align="center"
|
||||
label="供应商"
|
||||
></el-table-column>
|
||||
<el-table-column
|
||||
prop="headerPhone"
|
||||
prop="handler"
|
||||
align="center"
|
||||
label="经手人"
|
||||
></el-table-column>
|
||||
<el-table-column
|
||||
prop="headerPhone"
|
||||
prop="lotNumber"
|
||||
align="center"
|
||||
label="批号"
|
||||
></el-table-column>
|
||||
<el-table-column
|
||||
prop="headerPhone"
|
||||
prop="singleHanded"
|
||||
align="center"
|
||||
label="制单人"
|
||||
></el-table-column>
|
||||
<el-table-column
|
||||
prop="headerPhone"
|
||||
prop="createTime"
|
||||
align="center"
|
||||
label="制单时间"
|
||||
></el-table-column>
|
||||
@ -187,88 +175,78 @@
|
||||
<el-form
|
||||
style="margin: 0 28px"
|
||||
size="medium"
|
||||
:model="contractForm"
|
||||
ref="contractForm"
|
||||
:rules="contractFormRules"
|
||||
:model="addForm"
|
||||
ref="addForm"
|
||||
:rules="addFormules"
|
||||
:inline="true"
|
||||
>
|
||||
<el-form-item label="日期" prop="arrivalTime">
|
||||
<el-form-item label="日期" prop="createTime">
|
||||
<el-date-picker
|
||||
v-model="value1"
|
||||
v-model="addForm.createTime"
|
||||
type="date"
|
||||
placeholder="选择日期"
|
||||
value-format="yyyy-MM-dd HH:mm"
|
||||
value-format="yyyy-MM-dd"
|
||||
>
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item label="仓库" prop="enterpriseId">
|
||||
<el-form-item label="仓库" prop="warehouse">
|
||||
<el-input
|
||||
v-model="searchForm.warehouseName"
|
||||
placeholder="请输入"
|
||||
></el-input>
|
||||
v-model="addForm.warehouse"
|
||||
placeholder="请输入"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="类型" prop="enterpriseId">
|
||||
<el-form-item label="类型" prop="category">
|
||||
<el-input
|
||||
v-model="searchForm.warehouseName"
|
||||
placeholder="请输入"
|
||||
></el-input>
|
||||
v-model="addForm.category"
|
||||
placeholder="请输入"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
|
||||
|
||||
<el-form-item label="方向" prop="direction" style="margin-left: 15px">
|
||||
<el-input
|
||||
v-model="addForm.direction"
|
||||
placeholder="请输入"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item
|
||||
label="方向"
|
||||
prop="enterpriseId"
|
||||
style="margin-left: 15px"
|
||||
label="编号"
|
||||
prop="serialNumber"
|
||||
style="margin-left: 10px"
|
||||
>
|
||||
<el-input
|
||||
v-model="searchForm.warehouseName"
|
||||
placeholder="请输入"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="编号" prop="orderNumber" style="margin-left: 10px">
|
||||
<el-input
|
||||
v-model="contractForm.orderNumber"
|
||||
v-model="addForm.serialNumber"
|
||||
placeholder="请输入"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="单号" prop="orderNumber">
|
||||
<el-form-item label="单号" prop="number">
|
||||
<el-input v-model="addForm.number" placeholder="请输入"></el-input>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="批号" prop="lotNumber">
|
||||
<el-input
|
||||
v-model="contractForm.orderNumber"
|
||||
v-model="addForm.lotNumber"
|
||||
placeholder="请输入"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="批号" prop="orderNumber">
|
||||
<el-form-item label="部门" prop="department">
|
||||
<el-input
|
||||
v-model="contractForm.orderNumber"
|
||||
v-model="addForm.department"
|
||||
placeholder="请输入"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="部门" prop="enterpriseId">
|
||||
<el-input
|
||||
v-model="searchForm.warehouseName"
|
||||
placeholder="请输入"
|
||||
></el-input>
|
||||
<el-form-item label="经手人" prop="handler">
|
||||
<el-input v-model="addForm.handler" placeholder="请输入"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="经手人" prop="enterpriseId">
|
||||
<el-form-item label="制单人" prop="singleHanded">
|
||||
<el-input
|
||||
v-model="searchForm.warehouseName"
|
||||
placeholder="请输入"
|
||||
></el-input>
|
||||
v-model="addForm.singleHanded"
|
||||
placeholder="请输入"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="制单人" prop="enterpriseId">
|
||||
<el-input
|
||||
v-model="searchForm.warehouseName"
|
||||
placeholder="请输入"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="供货单位" prop="enterpriseId">
|
||||
<el-input
|
||||
v-model="searchForm.warehouseName"
|
||||
placeholder="请输入"
|
||||
></el-input>
|
||||
<el-form-item label="供货单位" prop="vendor">
|
||||
<el-input v-model="addForm.vendor" placeholder="请输入"></el-input>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="备注" prop="remarks">
|
||||
@ -276,7 +254,7 @@
|
||||
style="width: 790px"
|
||||
type="textarea"
|
||||
:rows="1"
|
||||
v-model="contractForm.remarks"
|
||||
v-model="addForm.remark"
|
||||
placeholder="请输入"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
@ -305,12 +283,12 @@
|
||||
></el-input>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="specifications" label="规格" align="center">
|
||||
<el-table-column prop="specification" label="规格" align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-input
|
||||
style="width: 122px"
|
||||
size="mini"
|
||||
v-model="scope.row.specifications"
|
||||
v-model="scope.row.specification"
|
||||
></el-input>
|
||||
</template>
|
||||
</el-table-column>
|
||||
@ -323,12 +301,12 @@
|
||||
></el-input>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="materialNum" label="数量" align="center">
|
||||
<el-table-column prop="quantity" label="数量" align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-input
|
||||
style="width: 122px"
|
||||
size="mini"
|
||||
v-model="scope.row.materialNum"
|
||||
v-model="scope.row.quantity"
|
||||
></el-input>
|
||||
</template>
|
||||
</el-table-column>
|
||||
@ -341,12 +319,12 @@
|
||||
></el-input>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="computeUnit" label="金额" align="center">
|
||||
<el-table-column prop="amount" label="金额" align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-input
|
||||
style="width: 122px"
|
||||
size="mini"
|
||||
v-model="scope.row.computeUnit"
|
||||
v-model="scope.row.amount"
|
||||
></el-input>
|
||||
</template>
|
||||
</el-table-column>
|
||||
@ -378,7 +356,211 @@
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</div>
|
||||
<div class="dialog-footer" style="text-align: center;">
|
||||
<div class="dialog-footer" style="text-align: center">
|
||||
<el-button
|
||||
class="cancleBtn"
|
||||
@click="dialogShow = false"
|
||||
icon="el-icon-circle-close"
|
||||
size="medium"
|
||||
>取消
|
||||
</el-button>
|
||||
|
||||
<el-button
|
||||
type="primary"
|
||||
icon="el-icon-circle-check"
|
||||
@click="saveContractInfoFn(2)"
|
||||
size="medium"
|
||||
>
|
||||
保存
|
||||
</el-button>
|
||||
</div>
|
||||
</div>
|
||||
</el-dialog>
|
||||
<!--详情信息弹框-->
|
||||
<el-dialog
|
||||
:modal-append-to-body="false"
|
||||
title="详情"
|
||||
:visible.sync="deliteShow"
|
||||
width="1167px"
|
||||
>
|
||||
<div class="dialog_content">
|
||||
<el-form
|
||||
style="margin: 0 28px"
|
||||
size="medium"
|
||||
:model="addForm"
|
||||
ref="addForm"
|
||||
:rules="addFormules"
|
||||
:inline="true"
|
||||
>
|
||||
<el-form-item label="日期" prop="createTime">
|
||||
<el-date-picker
|
||||
v-model="detailData.createTime"
|
||||
type="date"
|
||||
placeholder="选择日期"
|
||||
value-format="yyyy-MM-dd"
|
||||
>
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item label="仓库" prop="warehouse">
|
||||
<el-input
|
||||
v-model="detailData.warehouse"
|
||||
placeholder="请输入"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="类型" prop="category">
|
||||
<el-input
|
||||
v-model="detailData.category"
|
||||
placeholder="请输入"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="方向" prop="direction" style="margin-left: 15px">
|
||||
<el-input
|
||||
v-model="detailData.direction"
|
||||
placeholder="请输入"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item
|
||||
label="编号"
|
||||
prop="serialNumber"
|
||||
style="margin-left: 10px"
|
||||
>
|
||||
<el-input
|
||||
v-model="detailData.serialNumber"
|
||||
placeholder="请输入"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="单号" prop="number">
|
||||
<el-input v-model="detailData.number" placeholder="请输入"></el-input>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="批号" prop="lotNumber">
|
||||
<el-input
|
||||
v-model="detailData.lotNumber"
|
||||
placeholder="请输入"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="部门" prop="department">
|
||||
<el-input
|
||||
v-model="detailData.department"
|
||||
placeholder="请输入"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="经手人" prop="handler">
|
||||
<el-input v-model="detailData.handler" placeholder="请输入"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="制单人" prop="singleHanded">
|
||||
<el-input
|
||||
v-model="detailData.singleHanded"
|
||||
placeholder="请输入"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="供货单位" prop="vendor">
|
||||
<el-input v-model="detailData.vendor" placeholder="请输入"></el-input>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="备注" prop="remarks">
|
||||
<el-input
|
||||
style="width: 790px"
|
||||
type="textarea"
|
||||
:rows="1"
|
||||
v-model="detailData.remark"
|
||||
placeholder="请输入"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<div class="importMaterialBox">
|
||||
<el-table
|
||||
class="tables"
|
||||
:data="deliteMaterialList"
|
||||
height="360"
|
||||
style="min-height: auto"
|
||||
>
|
||||
<el-table-column prop="name" label="品名" align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-input
|
||||
style="width: 122px"
|
||||
size="mini"
|
||||
v-model="scope.row.name"
|
||||
></el-input>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="specification" label="规格" align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-input
|
||||
style="width: 122px"
|
||||
size="mini"
|
||||
v-model="scope.row.specification"
|
||||
></el-input>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="unit" label="单位" align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-input
|
||||
style="width: 122px"
|
||||
size="mini"
|
||||
v-model="scope.row.unit"
|
||||
></el-input>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="quantity" label="数量" align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-input
|
||||
style="width: 122px"
|
||||
size="mini"
|
||||
v-model="scope.row.quantity"
|
||||
></el-input>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="unitPrice" label="单价" align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-input
|
||||
style="width: 122px"
|
||||
size="mini"
|
||||
v-model="scope.row.unitPrice"
|
||||
></el-input>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="amount" label="金额" align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-input
|
||||
style="width: 122px"
|
||||
size="mini"
|
||||
v-model="scope.row.amount"
|
||||
></el-input>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="remark" label="备注" align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-input
|
||||
style="width: 122px"
|
||||
size="mini"
|
||||
v-model="scope.row.remark"
|
||||
></el-input>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" align="center">
|
||||
<template slot-scope="scope">
|
||||
<div class="tableBtns" style="margin-left: 35px !important">
|
||||
<div
|
||||
@click="deleteTable(scope.row, scope.index)"
|
||||
class="operationText"
|
||||
>
|
||||
<img
|
||||
src="@/assets/images/icon-delete.png"
|
||||
width="15px"
|
||||
height="15px"
|
||||
/>
|
||||
<span>删除</span>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</div>
|
||||
<div class="dialog-footer" style="text-align: center">
|
||||
<el-button
|
||||
class="cancleBtn"
|
||||
@click="dialogShow = false"
|
||||
@ -409,29 +591,57 @@
|
||||
</template>
|
||||
<script>
|
||||
import {
|
||||
addStuffWarehouseApi,
|
||||
deleteStuffWarehouseApi,
|
||||
editStuffWarehouseApi,
|
||||
getStuffWarehousePageApi
|
||||
} from '@/assets/js/api/warehouseManagement.js'
|
||||
addGtMaterialInOutWarehouseApi,
|
||||
deletGtMaterialInOutWarehouseApi,
|
||||
editGtMaterialInOutWarehouseApi,
|
||||
gettGMaterialInOutWarehouseAPageApi
|
||||
} from '@/assets/js/api/materialManagement.js'
|
||||
export default {
|
||||
mounted() {
|
||||
this.getList()
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
deliteShow:false,
|
||||
detailData:{},
|
||||
searchForm: {
|
||||
number: "",
|
||||
// test1:"",//货号
|
||||
warehouse: "",
|
||||
department: "",
|
||||
category: "",
|
||||
handler: "",
|
||||
test: "",//助查码
|
||||
// 开始结束 :"",
|
||||
vendor: "",
|
||||
},//查询
|
||||
addForm: {
|
||||
createTime: "",
|
||||
warehouse: "",
|
||||
category: "",
|
||||
direction: "",
|
||||
serialNumber: "",
|
||||
number: "",
|
||||
lotNumber: "",
|
||||
department: "",
|
||||
handler: "",
|
||||
singleHanded: "",
|
||||
vendor: "",
|
||||
remark: "",
|
||||
},//表单
|
||||
orderMaterialList: [
|
||||
{
|
||||
name: "",
|
||||
specifications: "",
|
||||
specification: "",
|
||||
unit: "",
|
||||
materialNum: "",
|
||||
quantity: "",
|
||||
unitPrice: "",
|
||||
computeUnit: "",
|
||||
amount: "",
|
||||
remark: "",
|
||||
}
|
||||
],
|
||||
contractForm: {},
|
||||
deliteMaterialList:[],//详情
|
||||
addFormules: {},
|
||||
title: "",
|
||||
dialogShow: false,
|
||||
pagInfo: {
|
||||
@ -440,72 +650,16 @@ export default {
|
||||
total: 0 //总条数
|
||||
},
|
||||
List: [],
|
||||
addEditForm: {
|
||||
warehouseName: '',//仓库名称
|
||||
warehousePos: '',//warehousePos
|
||||
header: '',//负责人
|
||||
headerPhone: '',//负责人电话
|
||||
remark: '',//备注
|
||||
},
|
||||
addEditRules: {
|
||||
warehouseName: [
|
||||
{
|
||||
required: true,
|
||||
message: this.$t('message.carManage.required'),
|
||||
trigger: 'blur'
|
||||
},
|
||||
{
|
||||
required: true,
|
||||
message: this.$t('message.carManage.required'),
|
||||
trigger: 'change'
|
||||
}
|
||||
],
|
||||
warehousePos: [
|
||||
{
|
||||
required: true,
|
||||
message: this.$t('message.carManage.required'),
|
||||
trigger: 'blur'
|
||||
},
|
||||
{
|
||||
required: true,
|
||||
message: this.$t('message.carManage.required'),
|
||||
trigger: 'change'
|
||||
}
|
||||
],
|
||||
header: [
|
||||
{
|
||||
required: true,
|
||||
message: this.$t('message.carManage.required'),
|
||||
trigger: 'blur'
|
||||
},
|
||||
{
|
||||
required: true,
|
||||
message: this.$t('message.carManage.required'),
|
||||
trigger: 'change'
|
||||
}
|
||||
],
|
||||
headerPhone: [
|
||||
{
|
||||
required: true,
|
||||
message: this.$t('message.carManage.required'),
|
||||
trigger: 'blur'
|
||||
},
|
||||
{
|
||||
required: true,
|
||||
message: this.$t('message.carManage.required'),
|
||||
trigger: 'change'
|
||||
}
|
||||
],
|
||||
|
||||
},
|
||||
searchForm: {
|
||||
warehouseName: '',
|
||||
warehouseNumber: '',
|
||||
warehousePos: '',
|
||||
},
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
//显示检查详细弹框
|
||||
showDetailFn(row) {
|
||||
this.detailData = row
|
||||
this.deliteShow = true
|
||||
// this.gtMaterialContractId = this.detailData.id
|
||||
},
|
||||
//表格动态添加
|
||||
importMaterial() {
|
||||
let statusType = true;
|
||||
@ -522,11 +676,11 @@ export default {
|
||||
if (statusType) {
|
||||
this.orderMaterialList.push({
|
||||
name: "",
|
||||
specifications: "",
|
||||
specification: "",
|
||||
unit: "",
|
||||
materialNum: "",
|
||||
quantity: "",
|
||||
unitPrice: "",
|
||||
computeUnit: "",
|
||||
amount: "",
|
||||
remark: "",
|
||||
});
|
||||
}
|
||||
@ -558,7 +712,7 @@ export default {
|
||||
add() {
|
||||
this.title = '新增'
|
||||
this.dialogShow = true
|
||||
this.orderMaterialList=[]
|
||||
this.orderMaterialList = []
|
||||
this.close()
|
||||
},
|
||||
|
||||
|
||||
@ -41,9 +41,9 @@
|
||||
<!-- 中建五局添加字段 -->
|
||||
<span v-if="COMPANY == 'zjwj'"
|
||||
>整改率:
|
||||
<span class="value">{{
|
||||
statisticsValue.rectificationRatio
|
||||
}}%</span></span
|
||||
<span class="value"
|
||||
>{{ statisticsValue.rectificationRatio }}%</span
|
||||
></span
|
||||
>
|
||||
<span v-if="COMPANY == 'zjwj'"
|
||||
>闭合率:
|
||||
@ -352,8 +352,8 @@
|
||||
:model="addForm1"
|
||||
label-width="120px"
|
||||
>
|
||||
<!-- 图纸定位 -->
|
||||
<el-form-item
|
||||
<!-- 图纸定位 -->
|
||||
<el-form-item
|
||||
v-if="COMPANY != 'longguang'"
|
||||
:label="$t('message.quality.drawingPositioning')"
|
||||
>
|
||||
@ -620,7 +620,7 @@
|
||||
>
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
|
||||
|
||||
<el-form-item
|
||||
v-if="COMPANY != 'zjwj'"
|
||||
:label="$t('message.quality.subContractor')"
|
||||
@ -668,7 +668,7 @@
|
||||
>
|
||||
<el-option
|
||||
v-for="item in crewList"
|
||||
:key="item.userId "
|
||||
:key="item.userId"
|
||||
:label="item.workerName"
|
||||
:value="item.userId"
|
||||
>
|
||||
@ -1418,7 +1418,7 @@ export default {
|
||||
level: '',
|
||||
status: '',
|
||||
urgentLevel: '',
|
||||
regionId:'',
|
||||
regionId: '',
|
||||
},
|
||||
type: 'add',
|
||||
pageNo: 1,
|
||||
@ -1593,26 +1593,49 @@ export default {
|
||||
},
|
||||
//导出
|
||||
exportData() {
|
||||
window.location.href =
|
||||
this.$http.defaults.baseURL +
|
||||
'xmgl/download/exporExcelQualityInspectionRecord?projectSn=' +
|
||||
this.$store.state.projectSn +
|
||||
'&recordStatus=' +
|
||||
this.formInline.recordStatus +
|
||||
'&inspectStartTime=' +
|
||||
this.formInline.inspectStartTime +
|
||||
'&inspectEndTime=' +
|
||||
this.formInline.inspectEndTime +
|
||||
'&level=' +
|
||||
this.formInline.level +
|
||||
'&status=' +
|
||||
this.formInline.status +
|
||||
'&urgentLevel=' +
|
||||
this.formInline.urgentLevel +
|
||||
'&pageNo=' +
|
||||
this.pageNo +
|
||||
'&pageSize=' +
|
||||
this.pageSize
|
||||
if (this.COMPANY == 'zjwj') {
|
||||
window.location.href =
|
||||
this.$http.defaults.baseURL +
|
||||
'/xmgl/qualityRectifyRecord/recordRectify/excel/export?projectSn=' +
|
||||
this.$store.state.projectSn +
|
||||
'&recordStatus=' +
|
||||
this.formInline.recordStatus +
|
||||
'&inspectStartTime=' +
|
||||
this.formInline.inspectStartTime +
|
||||
'&inspectEndTime=' +
|
||||
this.formInline.inspectEndTime +
|
||||
'&level=' +
|
||||
this.formInline.level +
|
||||
'&status=' +
|
||||
this.formInline.status +
|
||||
'&pageNo=' +
|
||||
this.pageNo +
|
||||
'&pageSize=' +
|
||||
this.pageSize
|
||||
}
|
||||
else {
|
||||
window.location.href =
|
||||
this.$http.defaults.baseURL +
|
||||
'xmgl/download/exporExcelQualityInspectionRecord?projectSn=' +
|
||||
this.$store.state.projectSn +
|
||||
'&recordStatus=' +
|
||||
this.formInline.recordStatus +
|
||||
'&inspectStartTime=' +
|
||||
this.formInline.inspectStartTime +
|
||||
'&inspectEndTime=' +
|
||||
this.formInline.inspectEndTime +
|
||||
'&level=' +
|
||||
this.formInline.level +
|
||||
'&status=' +
|
||||
this.formInline.status +
|
||||
'&urgentLevel=' +
|
||||
this.formInline.urgentLevel +
|
||||
'&pageNo=' +
|
||||
this.pageNo +
|
||||
'&pageSize=' +
|
||||
this.pageSize
|
||||
}
|
||||
|
||||
},
|
||||
openImg(src) {
|
||||
window.open(src)
|
||||
@ -2331,7 +2354,7 @@ export default {
|
||||
this.fileList4 = []
|
||||
this.pointList = []
|
||||
this.recordType = 1
|
||||
this.mapUrl = ''
|
||||
this.mapUrl = ''
|
||||
this.pageNo = 1
|
||||
this.onSubmit()
|
||||
}
|
||||
|
||||
@ -24,7 +24,7 @@
|
||||
:on-change="handleImportChange"
|
||||
:before-upload="beforeUpload"
|
||||
:file-list="fileList"
|
||||
:action="$http.defaults.baseURL + '/xmgl/progressTask/importData'"
|
||||
:action="$http.defaults.baseURL + 'xmgl/progressTask/importData'"
|
||||
:data="{ projectSn: projectSn, createUserId: createUserId }"
|
||||
:show-file-list="false"
|
||||
:headers="headers"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user