fengdong777 2 years ago
parent
commit
1900cc4a2f
  1. 20
      warehousing-system/project_web_ui/src/views/component/instorehouse/add/purchaseAdd.vue
  2. 8
      warehousing-system/project_web_ui/src/views/component/instorehouse/purchase.vue
  3. 4
      warehousing-system/project_web_ui/src/views/component/pictureList/pictureList.vue
  4. 21
      warehousing-system/project_web_ui/src/views/component/stockManagement/stockList.vue
  5. 2
      yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchmodletemplate/dispatchmodletemplate.vue
  6. 4
      yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchorderinfo/dispatchorderinfoAdd.vue

20
warehousing-system/project_web_ui/src/views/component/instorehouse/add/purchaseAdd.vue

@ -147,14 +147,14 @@
<el-input v-model="scope.row.estimateConfirmedPrice" @input="limitInput1($event,scope.$index)" placeholder="" clearable></el-input>
</template>
</el-table-column>
<el-table-column label="数量" width="100" prop="estimateNum" align="center">
<el-table-column label="数量" width="140" prop="estimateNum" align="center">
<template slot-scope="scope">
<el-input v-model="scope.row.estimateNum" @input="limitInput2($event,scope.$index)" placeholder="" clearable></el-input>
</template>
</el-table-column>
<el-table-column label="总价值" width="120px" prop="estimateCalculatedValue" align="center">
<el-table-column label="总价值" width="150px" prop="estimateCalculatedValue" align="center">
<template slot-scope="scope">
<el-input v-model="scope.row.estimateCalculatedValue" @input="limitInput3($event,scope.$index)" :readonly="true" placeholder="" clearable></el-input>
<el-input v-model="scope.row.estimateCalculatedValue" :readonly="true" placeholder="" clearable></el-input>
</template>
</el-table-column>
<el-table-column label="规格单位" width="130" prop="proUnit" align="center">
@ -296,6 +296,7 @@
showAdd() {
this.viewTitle = "【新增】采购订单";
this.clearList()
this.openAddPurchaseDialog()
},
async showEdit(row) {
this.viewTitle = "【修改】采购订单";
@ -341,7 +342,6 @@
}
},
openAddPurchaseDialog () {
this.clearList()
var now = new Date()
this.purchaseForm.purchaseNo = 'IP' + now.getTime()
if (this.productList2.length == 0) this.productList2 = this.productList
@ -368,7 +368,8 @@
for(let i=0;i<arrList.length;i++){
if(arrList[i].estimateNum && arrList[i].estimateConfirmedPrice){
let newValue=parseFloat(arrList[i].estimateNum) * parseFloat(arrList[i].estimateConfirmedPrice) || 0
this.$set(arrList[i], 'estimateCalculatedValue', newValue)
let getValue=Math.floor(newValue*100)/100
this.$set(arrList[i], 'estimateCalculatedValue', getValue)
}else{
this.$set(arrList[i], 'estimateCalculatedValue', '')
}
@ -392,15 +393,6 @@
.match(/^\d*(\.?\d{0,2})/g)[0] || ""; // 02
this.getLists()
},
limitInput3(value, index) {
this.purchaseForm.products[index].estimateCalculatedValue =
("" + value) //
.replace(/[^\d^\.]+/g, "") //
.replace(/^0+(\d)/, "$1") // 00
.replace(/^\./, "0.") // 0.
.match(/^\d*(\.?\d{0,2})/g)[0] || ""; // 02
this.getLists()
},
},
};
</script>

8
warehousing-system/project_web_ui/src/views/component/instorehouse/purchase.vue

@ -18,7 +18,7 @@
</div>
</div>
<el-table :data="purchaseList.slice((queryInfo.current-1)*queryInfo.size,queryInfo.current*queryInfo.size)"
<el-table :data="purchaseList"
style="width: 100%"
border>
<el-table-column label="序号" type="index" width="60" :index="indexMethod" align="center" />
@ -194,14 +194,10 @@ export default {
},
async getPurchaseList () {
const { data: result } = await this.$http.post('/purchasenew/listPage', this.queryInfo)
console.log(result);
if (result.code == 200){
console.log(result);
this.queryInfo.total=result.data.total
this.purchaseList = result.data.records
}
console.log(this.purchaseList);
},
clearList(){
this.purchaseForm={
@ -242,7 +238,7 @@ export default {
toAdd() {
this.viewState = 2
// this.$refs['divadd'].showAdd()
this.$refs['divadd'].showAdd()
},
doClose() {
this.$store.dispatch('tagsView/delView', this.$route)

4
warehousing-system/project_web_ui/src/views/component/pictureList/pictureList.vue

@ -173,7 +173,7 @@ export default {
height: 140px;
width: 160px;
position: absolute;
top: 20px;
top: 10px;
left: 0;
img {
height: 100%;
@ -182,7 +182,7 @@ export default {
}
.warehouseName {
position: absolute;
top: 20px;
top: 10px;
left: 180px;
position: relative;
h2 {

21
warehousing-system/project_web_ui/src/views/component/stockManagement/stockList.vue

@ -10,6 +10,16 @@
<el-form-item label="商品名">
<el-input v-model="queryInfo.query" placeholder="请输入商品名" clearable />
</el-form-item>
<el-form-item label="仓库名称">
<el-select v-model="queryInfo.cangku" placeholder="请选择" >
<el-option
v-for="(storehouse,i) in storehouseList"
:key="i"
:label="storehouse.name"
:value="storehouse.name">
</el-option>
</el-select>
</el-form-item>
</el-form>
<div class="btn" style="text-align: center;">
<el-button type="primary" size="small" icon="el-icon-search" @click="getStockList">查询</el-button>
@ -123,10 +133,12 @@ export default {
params: {},
current: 1,
size: 10,
query:''
query:'',
cangku:''
},
total: 0,
stockList: [],
storehouseList: [],
btnList: [
{
type: 'info',
@ -176,6 +188,12 @@ export default {
this.stockList = result.data.records
console.log( this.stockList);
},
async getStorehouseList () {
const { data: result } = await this.$http.get("/v1/shstorehouse/listAll")
if (result.code == 200){
this.storehouseList = result.data
}
},
doClose() {
this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1)
@ -186,6 +204,7 @@ export default {
mounted () {
this.$refs['btnbar'].setButtonList(this.btnList)
this.getStockList()
this.getStorehouseList()
}
}
</script>

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

@ -157,7 +157,7 @@ export default {
params: {
sids: [], // SID
templatename: '', // id
ordertype: '' // id
ordertype: '' // id
}
},
btnList: [

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

@ -210,7 +210,7 @@ export default {
receivetel: '', //
workers:[]
},
custList:[],
custList:[],
arr:[{value:1,type:'计划巡视'},{value:2,type:'专项巡视'},{value:3,type:'告警巡视'}],
arrList:[{value:1,type:'一般'},{value:2,type:'重要'},{value:3,type:'紧急'},{value:4,type:'督办'}],
TabList:[],
@ -247,7 +247,7 @@ export default {
total: 0,
params: {
orderid:'',
templateid:''
templateid:''
}
}
}

Loading…
Cancel
Save