suojin
/
smartpark_durable_front
25
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

详情和上传接口修改

Browse Source
master
zhangdi 2 weeks ago
parent 85377b1d3d
commit d0d6fee4f5
2 changed files with 78 additions and 4 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/router/axios.js
  2. 80
      src/views/secondOrder/components/outDialog.vue

2
src/router/axios.js
Unescape View File

@ -50,7 +50,7 @@ axios.interceptors.request.use(config => {
// config.url = config.url;
// 发版打开下面注释
if(config.url.indexOf('/smartpark') != -1){
if(config.url.indexOf('/AES/decryptAndGetUser') != -1){
if((config.url.indexOf('/AES/decryptAndGetUser') != -1)||(config.url.indexOf('/ld-person-form/upload') != -1)){
config.url = config.url.replace('/smartparkAPP','http://atcflight.com:10094/6583e0b6-a422-4c74-aa40-df48e059b4de/lowDurableTest')
}else{
config.url = config.url.replace('/smartpark','http://atcflight.com:10094/6583e0b6-a422-4c74-aa40-df48e059b4de/lowDurableWebTestFront/smartpark')

80
src/views/secondOrder/components/outDialog.vue
Unescape View File

@ -68,7 +68,76 @@
</el-col>
</el-row>
<div class="form-title">{{ outDateInfo }} 出库信息：</div>
<div v-if="sizeForm.ldTwoOutStorage.groupName !== '自由出库'">
<div v-if="outDialogType == 'details'">
<el-button type="primary" size="mini" style="margin-bottom: 18px" @click="categoryHandle"
v-if="outDialogType != 'details'">新增</el-button>
<el-table :data="sizeForm.ldTwoOutStorageDetailList" border style="width: 100%" ref="table">
<el-table-column type="expand">
<template slot-scope="props">
<el-table :data="scope.row.twoInventoryVOList" border style="width: 100%"
v-if="scope.row.twoInventoryVOList">
<el-table-column prop="materialName" label="物资名称"></el-table-column>
<el-table-column prop="materialCode" label="物资编码"></el-table-column>
<el-table-column prop="type" label="物资类型"></el-table-column>
<el-table-column prop="num" label="数量"></el-table-column>
</el-table>
</template>
</el-table-column>
<el-table-column prop="materialCode" label="物资编码">
</el-table-column>
<el-table-column prop="materialName" label="物资名称"></el-table-column>
<el-table-column prop="model" label="规格/型号">
</el-table-column>
<el-table-column prop="type" label="类别">
<template slot-scope="scope">
{{
scope.row.type === "NY"
? "耐用品"
: scope.row.type === "YH"
? "易耗品"
: ""
}}
</template>
</el-table-column>
<el-table-column prop="unit" label="单位"> </el-table-column>
<el-table-column label="实际使用人" prop="userInfo">
<template slot-scope="scope">
<div v-if="outDialogType != 'details'">
<el-select v-model="scope.row.userInfo" placeholder="请选择" style="width: 100%" :disabled="sizeForm.departmentId == '' || outDialogType == 'details'
" clearable filterable value-key="userId"
@change="(val) => proposerChangeTable(val, scope.$index, 0)" v-if="scope.row.type == 'NY'">
<el-option v-for="item in userOptions" :key="item.userId" :label="item.name" :value="item">
</el-option>
</el-select>
<span v-else>-</span>
</div>
<div v-else>
{{ scope.row.userName }}
</div>
</template>
</el-table-column>
<el-table-column prop="num" label="数量">
<template slot-scope="scope">
<el-input-number size="mini" v-model="scope.row.num" :min="0" :max="getMaxQuantity(scope.row)"
style="width: 100%" :disabled="outDialogType != 'add' || scope.row.type === 'NY'
" @change="
(newValue) => handleQuantityChange(newValue, scope.$index)
"></el-input-number>
</template>
</el-table-column>
<el-table-column label="操作" width="100" v-if="outDialogType != 'details'">
<template slot-scope="scope">
<div :disabled="outDialogType == 'details'">
<el-button type="text" size="mini" @click="handleDelete(scope.$index, scope.row)">
删除
</el-button>
</div>
</template>
</el-table-column>
</el-table>
</div>
<div v-if="(sizeForm.ldTwoOutStorage.groupName !== '自由出库')&&(outDialogType != 'details')">
<el-table :data="groupTableData" style="width: 100%" border ref="groupTable"
@expand-change="handleExpandChange">
<!-- 展开行详情 -->
@ -127,7 +196,7 @@
</el-table>
</div>
<div v-if="sizeForm.ldTwoOutStorage.groupName == '自由出库'">
<div v-if="sizeForm.ldTwoOutStorage.groupName == '自由出库'&&(outDialogType != 'details')">
<el-button type="primary" size="mini" style="margin-bottom: 18px" @click="categoryHandle"
v-if="outDialogType != 'details'">新增</el-button>
<el-table :data="sizeForm.ldTwoOutStorageDetailList" border style="width: 100%" ref="table">
@ -162,13 +231,18 @@
<el-table-column prop="unit" label="单位"> </el-table-column>
<el-table-column label="实际使用人" prop="userInfo">
<template slot-scope="scope">
<el-select v-model="scope.row.userInfo" placeholder="请选择" style="width: 100%" :disabled="sizeForm.departmentId == '' || outDialogType == 'details'
<div v-if="outDialogType != 'details'">
<el-select v-model="scope.row.userInfo" placeholder="请选择" style="width: 100%" :disabled="sizeForm.departmentId == '' || outDialogType == 'details'
" clearable filterable value-key="userId"
@change="(val) => proposerChangeTable(val, scope.$index, 0)" v-if="scope.row.type == 'NY'">
<el-option v-for="item in userOptions" :key="item.userId" :label="item.name" :value="item">
</el-option>
</el-select>
<span v-else>-</span>
</div>
<div v-else>
{{ scope.row.userName }}
</div>
</template>
</el-table-column>
<el-table-column prop="num" label="数量">

Write Preview
Loading…
Cancel
Save