yunxi
/
SC-MOM
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复地点选择报错

Browse Source
product
17602169347 2 years ago
parent 552fafe370
commit 9da16916ed
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File

2
SC-boot/linkage-scm/src/main/java/jnpf/poundlist/controller/PoundlistController.java
Unescape View File

@ -392,7 +392,7 @@ public class PoundlistController {
public ActionResult<PoundlistInfoVO> info(@PathVariable("id") String id){ public ActionResult<PoundlistInfoVO> info(@PathVariable("id") String id){
PoundlistEntity entity= poundlistService.getInfo(id); PoundlistEntity entity= poundlistService.getInfo(id);
PoundlistInfoVO vo=JsonUtil.getJsonToBean(entity, PoundlistInfoVO.class); PoundlistInfoVO vo=JsonUtil.getJsonToBean(entity, PoundlistInfoVO.class);
vo.setOriginPlace(generaterSwapUtil.provinceData(vo.getOriginPlace()));
//子表 //子表
//副表 //副表
return ActionResult.success(vo); return ActionResult.success(vo);

2
SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/controller/TradeuploadController.java
Unescape View File

@ -734,7 +734,7 @@ public class TradeuploadController {
if(vo.getCreatorTime()!=null){ if(vo.getCreatorTime()!=null){
vo.setCreatorTime(vo.getCreatorTime()); vo.setCreatorTime(vo.getCreatorTime());
} }
vo.setOriginPlace(generaterSwapUtil.provinceData(vo.getOriginPlace()));
//子表 //子表
//副表 //副表
return ActionResult.success(vo); return ActionResult.success(vo);

22
SC-web/src/views/scm/basicInformation/poundlist/PurchaseOrderForm.vue
Unescape View File

@ -49,35 +49,35 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="垫资金额" prop="advanceAmount"> <el-form-item label="垫资金额" prop="advanceAmount">
<el-input-number v-model="dataForm.advanceAmount" placeholder="数字文本" :step="1" :precision="6" :style='{"width":"100%"}'> <el-input-number v-model="dataForm.advanceAmount" placeholder="数字文本" :step="1" :precision="6" :style='{"width":"100%"}' :disabled="true">
</el-input-number> </el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="重量" prop="num"> <el-form-item label="重量" prop="num">
<el-input-number v-model="dataForm.num" placeholder="数字文本" :step="1" :precision="6" :style='{"width":"100%"}'> <el-input-number v-model="dataForm.num" placeholder="数字文本" :step="1" :precision="6" :style='{"width":"100%"}' :disabled="true">
</el-input-number> </el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="金额" prop="amount"> <el-form-item label="金额" prop="amount">
<el-input-number v-model="dataForm.amount" placeholder="数字文本" :step="1" :precision="6" :style='{"width":"100%"}'> <el-input-number v-model="dataForm.amount" placeholder="数字文本" :step="1" :precision="6" :style='{"width":"100%"}' :disabled="true">
</el-input-number> </el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="不含税金额" prop="notAmount"> <el-form-item label="不含税金额" prop="notAmount">
<el-input-number v-model="dataForm.notAmount" placeholder="数字文本" :step="1" :precision="6" :style='{"width":"100%"}'> <el-input-number v-model="dataForm.notAmount" placeholder="数字文本" :step="1" :precision="6" :style='{"width":"100%"}' :disabled="true">
</el-input-number> </el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="税额" prop="rate"> <el-form-item label="税额" prop="rate">
<el-input-number v-model="dataForm.rate" placeholder="数字文本" :step="1" :precision="6" :style='{"width":"100%"}'> <el-input-number v-model="dataForm.rate" placeholder="数字文本" :step="1" :precision="6" :style='{"width":"100%"}' :disabled="true">
</el-input-number> </el-input-number>
</el-form-item> </el-form-item>
@ -221,21 +221,21 @@
</el-select> </el-select>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="amount" label="金额" align="center" width="130" > <el-table-column prop="remark" label="备注" align="center" width="130" >
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.amount" placeholder="请输入" clearable :style='{"width":"100%"}' :disabled="true"> <el-input v-model="scope.row.remark" placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="notAmount" label="不含税金额" align="center" width="130" > <el-table-column prop="amount" label="金额" align="center" width="130" >
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.notAmount" placeholder="请输入" clearable :style='{"width":"100%"}' :disabled="true"> <el-input v-model="scope.row.amount" placeholder="请输入" clearable :style='{"width":"100%"}' :disabled="true">
</el-input> </el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="remark" label="备注" align="center" width="130" > <el-table-column prop="notAmount" label="不含税金额" align="center" width="130" >
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.remark" placeholder="请输入" clearable :style='{"width":"100%"}'> <el-input v-model="scope.row.notAmount" placeholder="请输入" clearable :style='{"width":"100%"}' :disabled="true">
</el-input> </el-input>
</template> </template>
</el-table-column> </el-table-column>

2
SC-web/src/views/scm/basicInformation/purchaseorder/index.vue
Unescape View File

@ -84,7 +84,7 @@
{{ scope.row.status | dynamicText(statusOptions) }} {{ scope.row.status | dynamicText(statusOptions) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="erpNo" label="ERP订单号" sortable width="200" align="center" /> <!-- <el-table-column prop="erpNo" label="ERP订单号" sortable width="200" align="center" /> -->
<el-table-column prop="contractName" label="合同" sortable width="250" align="center" /> <el-table-column prop="contractName" label="合同" sortable width="250" align="center" />
<el-table-column prop="supplierName" label="供应商" sortable width="200" align="center" /> <el-table-column prop="supplierName" label="供应商" sortable width="200" align="center" />
<el-table-column prop="amount" label="金额" sortable width="150" align="center" /> <el-table-column prop="amount" label="金额" sortable width="150" align="center" />

Write Preview
Loading…
Cancel
Save