shawncai/ERP
1
1
Fork 0
mirror of https://github.com/shawncai/ERP.git synced 2024-09-20 15:06:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/shawncai/ERP

Browse source
This commit is contained in:
beyond 2020-05-19 19:24:14 +08:00
parent e00160dfbe 670731db64
commit 0cd1bbfffe
6 changed files with 32 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/views/CustomerSurveyReport/components/DetailList.vue
View file

@ -156,28 +156,28 @@ export default {
filters: {
resultFilter(status) {
const statusMap = {
1: '通过',
2: '不通过'
1: _that.$t('prompt.tg'),
2: _that.$t('prompt.btg')
}
return statusMap[status]
},
liveStatusFilter(status) {
const statusMap = {
1: '自有住房',
2: '租房',
3: '和亲戚住'
1: _that.$t('prompt.zyzf'),
2: _that.$t('prompt.zf'),
3: _that.$t('prompt.hqqyqz')
}
return statusMap[status]
},
liveTypeFilter(status) {
const statusMap = {
1: '旧的',
2: '新建筑',
3: '高档公寓',
4: '小隔间',
5: '普通公寓',
6: '双层楼建筑',
7: '低成本住房'
1: _that.$t('prompt.jiude'),
2: _that.$t('prompt.xjianz'),
3: _that.$t('prompt.gdgy'),
4: _that.$t('prompt.xgj'),
5: _that.$t('prompt.ptgy'),
6: _that.$t('prompt.scljz'),
7: _that.$t('prompt.dcbzf')
}
return statusMap[status]
},

2
src/views/InstallmentApply/InstallmentApplyList.vue
View file

@ -532,7 +532,7 @@ export default {
this.form.taskcontent = '分期申请调查'
this.form.sourceNumber = row.applyNumber
this.form.createId = row.createPersonId
this.form.remark = ''
this.form.remarks = ''
this.options2 = res.data.data.content.list
})
},

16
src/views/StockPlan/AddStockPlan.vue
View file

@ -107,21 +107,21 @@
<el-editable-column :label="$t('Hmodule.gg')" prop="productType" fixed="left" align="center" min-width="150px"/>
<el-editable-column :label="$t('updates.ys')" prop="color" fixed="left" align="center" min-width="150px"/>
<el-editable-column :label="$t('Hmodule.dw')" prop="unit" align="center" min-width="150px"/>
<el-editable-column :label="$t('updates.cgjhj')" prop="basicPrice" align="center" min-width="150px">
<!-- <el-editable-column :label="$t('updates.cgjhj')" prop="basicPrice" align="center" min-width="150px">
<template slot-scope="scope">
<p>{{ basicPrice(scope.row) }}</p>
</template>
</el-editable-column>
</el-editable-column> -->
<el-editable-column :label="$t('updates.kcsl')" prop="inventoryQuantity" align="center" min-width="150px"/>
<el-editable-column :label="$t('Hmodule.xqsl')" prop="requireQuantity" align="center" min-width="150px"/>
<el-editable-column :label="$t('updates.ysxqsl')" prop="requireQuantity2" align="center" min-width="150px"/>
<el-editable-column :label="$t('updates.xqrq')" prop="requireDate" align="center" min-width="150px"/>
<el-editable-column :edit-render="{name: 'ElInputNumber', attrs: {min: -0.01, precision: 6}, type: 'visible' ,events: {change: changeDate}}" :label="$t('updates.jhsl')" prop="planQuantity" align="center" min-width="150px"/>
<el-editable-column :label="$t('updates.jhje')" prop="planMoney" align="center" min-width="150px">
<!-- <el-editable-column :label="$t('updates.jhje')" prop="planMoney" align="center" min-width="150px">
<template slot-scope="scope">
<p>{{ planMoney(scope.row) }}</p>
</template>
</el-editable-column>
</el-editable-column> -->
<el-editable-column :edit-render="{name: 'ElDatePicker', attrs: {type: 'date', format: 'yyyy-MM-dd'}, type: 'visible', events: {change: changeDate}}" :label="$t('updates.jhjhrq')" prop="planDeliveryDate" align="center" min-width="170px">
<template slot="edit" slot-scope="scope">
<el-date-picker
@ -178,11 +178,11 @@
<el-editable-column :label="$t('Hmodule.gg')" prop="productType" align="center" min-width="150px"/>
<el-editable-column :label="$t('updates.ys')" prop="color" align="center" min-width="150px"/>
<el-editable-column :label="$t('Hmodule.dw')" prop="unit" align="center" min-width="150px"/>
<el-editable-column :label="$t('updates.cgjhj')" prop="basicPrice" align="center" min-width="150px">
<!-- <el-editable-column :label="$t('updates.cgjhj')" prop="basicPrice" align="center" min-width="150px">
<template slot-scope="scope">
<p>{{ basicPrice(scope.row) }}</p>
</template>
</el-editable-column>
</el-editable-column> -->
<el-editable-column :label="$t('updates.jhsl')" prop="planQuantity" align="center" min-width="150px">
<template slot-scope="scope">
<p>{{ planQuantity(scope.row) }}</p>
@ -212,11 +212,11 @@
<div class="container" style="margin-top: 25px">
<el-form ref="personalForm2" :model="personalForm" :rules="personalrules" :inline="true" status-icon class="demo-ruleForm" label-width="130px">
<el-row>
<el-col :span="6">
<!-- <el-col :span="6">
<el-form-item :label="$t('StockPlan.heji1')" style="margin-left: 18px;width: 100%;margin-bottom: 0;">
<el-input v-model="personalForm.allMoney" size="mini" style="margin-left: 18px;width:200px" disabled/>
</el-form-item>
</el-col>
</el-col> -->
<el-col :span="6">
<el-form-item :label="$t('StockPlan.heji2')" style="margin-left: 18px;width: 100%;margin-bottom: 0;">
<el-input v-model="personalForm.totalQuantity" size="mini" style="margin-left: 18px;width:200px" disabled/>

4
src/views/StockPlan/components/DetailList.vue
View file

@ -75,7 +75,7 @@
<el-editable-column :label="$t('Hmodule.gg')" prop="productType" align="center" />
<el-editable-column :label="$t('updates.ys')" prop="color" align="center" />
<el-editable-column :label="$t('Hmodule.dw')" prop="unit" align="center" />
<el-editable-column :label="$t('Hmodule.dj')" prop="basicPrice" align="center" />
<!-- <el-editable-column :label="$t('Hmodule.dj')" prop="basicPrice" align="center" /> -->
<el-editable-column :label="$t('updates.jhsl')" prop="planQuantity" align="center" />
<!-- <el-editable-column :label="$t('updates.jhje')" prop="planMoney" align="center" /> -->
<el-editable-column :label="$t('updates.jhjhrq')" prop="planDeliveryDate" align="center" />
@ -104,7 +104,7 @@
<el-editable-column :label="$t('Hmodule.gg')" prop="productType" align="center" />
<el-editable-column :label="$t('updates.ys')" prop="color" align="center" />
<el-editable-column :label="$t('Hmodule.dw')" prop="unit" align="center" />
<el-editable-column :label="$t('Hmodule.dj')" prop="basicPrice" align="center" />
<!-- <el-editable-column :label="$t('Hmodule.dj')" prop="basicPrice" align="center" /> -->
<el-editable-column :label="$t('updates.jhsl')" prop="planQuantity" align="center" />
<!-- <el-editable-column :label="$t('updates.jhje')" prop="planMoney" align="center" /> -->
<el-editable-column :label="$t('updates.jhjhrq')" prop="planDeliveryDate" align="center"/>

12
src/views/StockPlan/components/MyDialog.vue
View file

@ -104,15 +104,15 @@
<el-editable-column :label="$t('Hmodule.gg')" prop="productType" align="center" min-width="150px"/>
<el-editable-column :label="$t('updates.ys')" prop="color" align="center" min-width="150px"/>
<el-editable-column :label="$t('Hmodule.dw')" prop="unit" align="center" min-width="150px"/>
<el-editable-column :label="$t('Hmodule.dj')" prop="basicPrice" align="center" min-width="150px"/>
<!-- <el-editable-column :label="$t('Hmodule.dj')" prop="basicPrice" align="center" min-width="150px"/> -->
<el-editable-column :label="$t('Hmodule.xqsl')" prop="requireQuantity" align="center" min-width="150px"/>
<el-editable-column :label="$t('updates.xqrq')" prop="requireDate" align="center" min-width="150px"/>
<el-editable-column :edit-render="{name: 'ElInputNumber', attrs: {min: 0.00, precision: 6}, type: 'visible' ,events: {change: changeDate}}" :label="$t('updates.jhsl')" prop="planQuantity" align="center" min-width="150px"/>
<el-editable-column :label="$t('updates.jhje')" prop="planMoney" align="center" min-width="150px">
<!-- <el-editable-column :label="$t('updates.jhje')" prop="planMoney" align="center" min-width="150px">
<template slot-scope="scope">
<p>{{ planMoney(scope.row) }}</p>
</template>
</el-editable-column>
</el-editable-column> -->
<el-editable-column :edit-render="{name: 'ElDatePicker', attrs: {type: 'date', format: 'yyyy-MM-dd'}, type: 'visible', events: {change: changeDate}}" :label="$t('updates.jhjhrq')" prop="planDeliveryDate" align="center" min-width="170px">
<template slot="edit" slot-scope="scope">
<el-date-picker
@ -161,7 +161,7 @@
<el-editable-column :label="$t('Hmodule.gg')" prop="productType" align="center" min-width="150px"/>
<el-editable-column :label="$t('updates.ys')" prop="color" align="center" min-width="150px"/>
<el-editable-column :label="$t('Hmodule.dw')" prop="unit" align="center" min-width="150px"/>
<el-editable-column :label="$t('Hmodule.dj')" prop="basicPrice" align="center" min-width="150px"/>
<!-- <el-editable-column :label="$t('Hmodule.dj')" prop="basicPrice" align="center" min-width="150px"/> -->
<el-editable-column :label="$t('updates.jhsl')" prop="planQuantity" align="center" min-width="150px">
<template slot-scope="scope">
<p>{{ planQuantity(scope.row) }}</p>
@ -182,11 +182,11 @@
<div class="container" style="margin-top: 25px">
<el-form ref="personalForm2" :model="personalForm" :rules="personalrules" :inline="true" status-icon class="demo-ruleForm" label-width="130px">
<el-row>
<el-col :span="6">
<!-- <el-col :span="6">
<el-form-item :label="$t('StockPlan.heji1')" style="margin-left: 18px;width: 100%;margin-bottom: 0;">
<el-input v-model="heji1" size="mini" style="margin-left: 18px;width:200px" disabled/>
</el-form-item>
</el-col>
</el-col> -->
<el-col :span="6">
<el-form-item :label="$t('StockPlan.heji2')" style="margin-left: 18px;width: 100%;margin-bottom: 0;">
<el-input v-model="heji2" size="mini" style="margin-left: 18px;width:200px" disabled/>

6
src/views/inventorycount2/InventorySluggishAnalysisTable.vue
View file

@ -203,11 +203,11 @@ export default {
tableKey: 0,
// 加载表格
listLoading: true,
// repositoryId: this.$store.getters.repositoryName,
repositoryId: this.$store.getters.repositoryName,
// 采购申请查询加展示参数
getemplist: {
repositoryId: this.$store.getters.repositoryId,
regionIds: this.$store.getters.regionIds,
type: 1
},
// 传给组件的数据
@ -318,8 +318,8 @@ export default {
},
// 清空搜索条件
restFilter() {
this.supplierId = ''
this.getemplist.supplierId = ''
this.repositoryId = ''
this.getemplist.repositoryId = ''
},
restFilter2() {
this.stockPersonId = ''