yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

master
fanzongzhe 11 months ago
parent
1eca218239 6e2238e1cb
commit
38d981931a
2 changed files with 78 additions and 36 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 62
      yxt-as-ui/src/views/goods/goods/goodsAdd.vue
  2. 52
      yxt-as-ui/src/views/goods/goods/goodsAdd2.vue

62
yxt-as-ui/src/views/goods/goods/goodsAdd.vue
View File

@ -135,7 +135,7 @@
<el-col :span="12"> <el-col :span="12">
<div class="span-sty">是否上架</div> <div class="span-sty">是否上架</div>
<el-form-item> <el-form-item>
<el-radio-group v-model="formobj.isListed" size="small" style="margin-left: 120px;"> <el-radio-group v-model="formobj.isListed" size="small" style="margin-left: 120px;">
<el-radio :label="'1'">上架</el-radio> <el-radio :label="'1'">上架</el-radio>
<el-radio :label="'2'">下架</el-radio> <el-radio :label="'2'">下架</el-radio>
</el-radio-group> </el-radio-group>
@ -373,7 +373,8 @@
<el-col :span="8"> <el-col :span="8">
<div class="span-sty">是否原厂</div> <div class="span-sty">是否原厂</div>
<el-form-item> <el-form-item>
<el-radio-group v-model="itemInfo.isOriginalFactory" :disabled="true" size="small" style="margin-left: 120px;"> <el-radio-group v-model="itemInfo.isOriginalFactory" :disabled="true" size="small"
style="margin-left: 120px;">
<el-radio :label="'1'">是</el-radio> <el-radio :label="'1'">是</el-radio>
<el-radio :label="'2'">否</el-radio> <el-radio :label="'2'">否</el-radio>
</el-radio-group> </el-radio-group>
@ -387,7 +388,8 @@
<el-col :span="8"> <el-col :span="8">
<div class="span-sty">是否库存警戒</div> <div class="span-sty">是否库存警戒</div>
<el-form-item> <el-form-item>
<el-radio-group v-model="itemInfo.isInventoryAlert" :disabled="true" size="small" style="margin-left: 120px;"> <el-radio-group v-model="itemInfo.isInventoryAlert" :disabled="true" size="small"
style="margin-left: 120px;">
<el-radio :label="'1'">是</el-radio> <el-radio :label="'1'">是</el-radio>
<el-radio :label="'2'">否</el-radio> <el-radio :label="'2'">否</el-radio>
</el-radio-group> </el-radio-group>
@ -473,7 +475,8 @@
<el-col :span="8"> <el-col :span="8">
<div class="span-sty">是否积分兑换</div> <div class="span-sty">是否积分兑换</div>
<el-form-item> <el-form-item>
<el-radio-group v-model="itemInfo.isIntegralExchange" :disabled="true" size="small" style="margin-left: 120px;"> <el-radio-group v-model="itemInfo.isIntegralExchange" :disabled="true" size="small"
style="margin-left: 120px;">
<el-radio :label="'1'">是</el-radio> <el-radio :label="'1'">是</el-radio>
<el-radio :label="'2'">否</el-radio> <el-radio :label="'2'">否</el-radio>
</el-radio-group> </el-radio-group>
@ -494,7 +497,8 @@
<el-col :span="8"> <el-col :span="8">
<div class="span-sty">锁定销售价格</div> <div class="span-sty">锁定销售价格</div>
<el-form-item> <el-form-item>
<el-radio-group v-model="itemInfo.isLockingSalesPrice" :disabled="true" size="small" style="margin-left: 120px;"> <el-radio-group v-model="itemInfo.isLockingSalesPrice" :disabled="true" size="small"
style="margin-left: 120px;">
<el-radio :label="'1'">是</el-radio> <el-radio :label="'1'">是</el-radio>
<el-radio :label="'2'">否</el-radio> <el-radio :label="'2'">否</el-radio>
</el-radio-group> </el-radio-group>
@ -567,7 +571,7 @@
<el-col :span="8"> <el-col :span="8">
<div class="span-sty">是否原厂</div> <div class="span-sty">是否原厂</div>
<el-form-item> <el-form-item>
<el-radio-group v-model="itemInfo.isOriginalFactory" size="small" style="margin-left: 120px;"> <el-radio-group v-model="itemInfo.isOriginalFactory" size="small" style="margin-left: 120px;">
<el-radio :label="'1'">是</el-radio> <el-radio :label="'1'">是</el-radio>
<el-radio :label="'2'">否</el-radio> <el-radio :label="'2'">否</el-radio>
</el-radio-group> </el-radio-group>
@ -676,7 +680,7 @@
<el-col :span="8"> <el-col :span="8">
<div class="span-sty">是否积分兑换</div> <div class="span-sty">是否积分兑换</div>
<el-form-item> <el-form-item>
<el-radio-group v-model="itemInfo.isIntegralExchange" size="small" style="margin-left: 120px;"> <el-radio-group v-model="itemInfo.isIntegralExchange" size="small" style="margin-left: 120px;">
<el-radio :label="'1'">是</el-radio> <el-radio :label="'1'">是</el-radio>
<el-radio :label="'2'">否</el-radio> <el-radio :label="'2'">否</el-radio>
</el-radio-group> </el-radio-group>
@ -698,7 +702,7 @@
<el-col :span="8"> <el-col :span="8">
<div class="span-sty">锁定销售价格</div> <div class="span-sty">锁定销售价格</div>
<el-form-item> <el-form-item>
<el-radio-group v-model="itemInfo.isLockingSalesPrice" size="small" style="margin-left: 120px;"> <el-radio-group v-model="itemInfo.isLockingSalesPrice" size="small" style="margin-left: 120px;">
<el-radio :label="'1'">是</el-radio> <el-radio :label="'1'">是</el-radio>
<el-radio :label="'2'">否</el-radio> <el-radio :label="'2'">否</el-radio>
</el-radio-group> </el-radio-group>
@ -782,9 +786,10 @@
goodsDescription: "" goodsDescription: ""
}, },
baseGoodsSkus: [], baseGoodsSkus: [],
useOrgSid: window.sessionStorage.getItem('departmentSid'), useOrgSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
.getItem('defaultOrgPath').lastIndexOf('/') + 1),
orgPath: window.sessionStorage.getItem('defaultOrgPath'), orgPath: window.sessionStorage.getItem('defaultOrgPath'),
createOrgSid: window.sessionStorage.getItem('orgSid'), createOrgSid:'',
userSid: window.sessionStorage.getItem('userSid'), userSid: window.sessionStorage.getItem('userSid'),
}, },
brandList: [], brandList: [],
@ -800,16 +805,31 @@
} }
}, },
created() { created() {
this.initData() // this.initData()
}, },
methods: { methods: {
initData() { initData() {
var parpams = { getOrgSidByPath({
orgPath: window.sessionStorage.getItem('defaultOrgPath'), orgPath: window.sessionStorage.getItem('defaultOrgPath')
userSid: window.sessionStorage.getItem('userSid'), }).then((res) => {
menuUrl: this.$route.path if (res.success) {
this.formobj.createOrgSid = res.data
}
})
// var parpams = {
// orgPath: window.sessionStorage.getItem('defaultOrgPath'),
// userSid: window.sessionStorage.getItem('userSid'),
// menuUrl: this.$route.path
// }
var parpams ={
useOrgSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
.getItem('defaultOrgPath').lastIndexOf('/') + 1)
} }
req2.getAllBrand(parpams).then(resp => { req2.getAllBrand(parpams).then(resp => {
this.brandList = resp.data this.brandList = resp.data
}) })
@ -874,14 +894,16 @@
goodsDescription: "" goodsDescription: ""
}, },
baseGoodsSkus: [], baseGoodsSkus: [],
useOrgSid: window.sessionStorage.getItem('departmentSid'), useOrgSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
orgPath: window.sessionStorage.getItem('defaultOrgPath'), .getItem('defaultOrgPath').lastIndexOf('/') + 1),
createOrgSid: window.sessionStorage.getItem('orgSid'), orgPath: window.sessionStorage.getItem('defaultOrgPath'),
userSid: window.sessionStorage.getItem('userSid'), createOrgSid:'',
userSid: window.sessionStorage.getItem('userSid'),
} }
this.$emit('doback') this.$emit('doback')
}, },
showAdd() { showAdd() {
this.initData()
var sid = require('uuid').v1() var sid = require('uuid').v1()
console.log('>>>>>>>>>showAdd', sid) console.log('>>>>>>>>>showAdd', sid)
@ -895,7 +917,7 @@
return index + 1 return index + 1
}, },
showEdit(row) { showEdit(row) {
this.initData()
this.$nextTick(() => { this.$nextTick(() => {
this.$refs['form_obj'].clearValidate() this.$refs['form_obj'].clearValidate()
}) })

52
yxt-as-ui/src/views/goods/goods/goodsAdd2.vue
View File

@ -117,8 +117,8 @@
<el-col :span="6"> <el-col :span="6">
<div class="span-sty">原厂标志</div> <div class="span-sty">原厂标志</div>
<el-form-item> <el-form-item>
<el-radio-group v-model="formobj.isOriginalFactory" size="medium" <el-radio-group v-model="formobj.isOriginalFactory" size="medium" style="margin-left: 120px;"
style="margin-left: 120px;" @change="selectIsOriginalFactory"> @change="selectIsOriginalFactory">
<el-radio :label="'1'">是</el-radio> <el-radio :label="'1'">是</el-radio>
<el-radio :label="'2'">否</el-radio> <el-radio :label="'2'">否</el-radio>
</el-radio-group> </el-radio-group>
@ -170,7 +170,7 @@
<el-col :span="6"> <el-col :span="6">
<div class="span-sty">锁定销售定价</div> <div class="span-sty">锁定销售定价</div>
<el-form-item> <el-form-item>
<el-radio-group v-model="formobj.isLockingSalesPrice" size="small" style="margin-left: 120px;" <el-radio-group v-model="formobj.isLockingSalesPrice" size="small" style="margin-left: 120px;"
@change="selectIsLockingSalesPrice"> @change="selectIsLockingSalesPrice">
<el-radio :label="'1'">是</el-radio> <el-radio :label="'1'">是</el-radio>
<el-radio :label="'2'">否</el-radio> <el-radio :label="'2'">否</el-radio>
@ -243,8 +243,10 @@
submitdisabled: false, submitdisabled: false,
formobj: { formobj: {
"sid": "", "sid": "",
"userSid": window.sessionStorage.getItem('userSid'), "userSid": '',
"orgPath": window.sessionStorage.getItem('orgSidPath'), "orgPath": '',
'useOrgSid': '',
'createOrgSid': '',
"goodsName": "", "goodsName": "",
"goodsCode": "", "goodsCode": "",
"goodsPY": "", "goodsPY": "",
@ -326,7 +328,7 @@
} }
}, },
created() { created() {
this.initData() // this.initData()
}, },
methods: { methods: {
@ -343,11 +345,26 @@
}, },
initData() { initData() {
getOrgSidByPath({
orgPath: window.sessionStorage.getItem('defaultOrgPath')
}).then((res) => {
if (res.success) {
this.formobj.createOrgSid = res.data
}
})
// var parpams = {
// orgPath: window.sessionStorage.getItem('defaultOrgPath'),
// userSid: window.sessionStorage.getItem('userSid'),
// menuUrl: this.$route.path
// }
var parpams = { var parpams = {
orgPath: window.sessionStorage.getItem('defaultOrgPath'), useOrgSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
userSid: window.sessionStorage.getItem('userSid'), .getItem('defaultOrgPath').lastIndexOf('/') + 1)
menuUrl: this.$route.path
} }
req2.getAllBrand(parpams).then(resp => { req2.getAllBrand(parpams).then(resp => {
this.brandList = resp.data this.brandList = resp.data
}) })
@ -396,8 +413,10 @@
if (isreload === 'true') this.$emit('reloadlist') if (isreload === 'true') this.$emit('reloadlist')
this.formobj = { this.formobj = {
"sid": "", "sid": "",
"userSid": window.sessionStorage.getItem('userSid'), "userSid": '',
"orgPath": window.sessionStorage.getItem('orgSidPath'), "orgPath": '',
'useOrgSid': '',
'createOrgSid': '',
"goodsName": "", "goodsName": "",
"goodsCode": "", "goodsCode": "",
"goodsPY": "", "goodsPY": "",
@ -433,17 +452,18 @@
// console.log('>>>>>>>>>showAdd', sid) // console.log('>>>>>>>>>showAdd', sid)
// this.formobj.sid = sid // this.formobj.sid = sid
this.initData()
this.$nextTick(() => { this.formobj.userSid = window.sessionStorage.getItem('userSid'),
this.$refs['form_obj'].clearValidate() this.$nextTick(() => {
}) this.$refs['form_obj'].clearValidate()
})
}, },
indexMethod(index) { indexMethod(index) {
return index + 1 return index + 1
}, },
showEdit(row) { showEdit(row) {
this.initData()
this.$nextTick(() => { this.$nextTick(() => {
this.$refs['form_obj'].clearValidate() this.$refs['form_obj'].clearValidate()
}) })

Write Preview
Loading…
Cancel
Save