Skip to content

P
pica.cloud.web-education-admin
提交 09c15d60 编写于 作者: shuang.zhou's avatar shuang.zhou
浏览文件
操作

Merge branch 'testing/3.29.0' of... 

Merge branch 'testing/3.29.0' of 192.168.110.53:com.pica.cloud.education.frontend/pica.cloud.web-education-admin into feature/med-goods-zs
上级 a02e26c9 f82a82a4
隐藏空白字符变更
内嵌 并排
正在显示 包含 143 行增加 和 32 行删除
src/views/goods/create-good.vue
浏览文件 @ 09c15d60
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
label-suffix="：" label-suffix="："
class="basic-form" class="basic-form"
> >
<!-- 通用信息 -->
<div class="basic-item-icon"> <div class="basic-item-icon">
<div class="part-tit">通用信息</div> <div class="part-tit">通用信息</div>
<el-form-item label="商品名称" prop="goodsName"> <el-form-item label="商品名称" prop="goodsName">
...@@ -185,6 +185,8 @@ ...@@ -185,6 +185,8 @@
</div> </div>
</el-form> </el-form>
<!-- 基本信息 -->
<el-form <el-form
ref="formData1" ref="formData1"
:model="formData1" :model="formData1"
...@@ -193,7 +195,7 @@ ...@@ -193,7 +195,7 @@
label-suffix="：" label-suffix="："
class="basic-form" class="basic-form"
> >
<div class="basic-item-icon" v-show="!isCheckServe"> <div class="basic-item-icon" v-if="!isCheckServe && !showTcm">
<div class="part-tit">基本信息</div> <div class="part-tit">基本信息</div>
<el-form-item label="条形码" prop="barCode"> <el-form-item label="条形码" prop="barCode">
<el-col :span="18"> <el-col :span="18">
...@@ -490,21 +492,96 @@ ...@@ -490,21 +492,96 @@
<p class="upload-message" v-if="!isSpecification_url">请上传说明书</p> <p class="upload-message" v-if="!isSpecification_url">请上传说明书</p>
</el-form-item> </el-form-item>
</div> </div>
</el-form> <div class="basic-item-icon" v-show="showTcm">
<div class="part-tit">基本信息</div>
<el-form-item label="适用项目" prop="useProject" class="required-label">
<el-col :span="13">
<el-input
:disabled="goodDisabled || barAndGoodsFlag || idMedicEdit"
size="small"
v-model="formData1.useProject"
placeholder="请输入适用项目"
style="width:70%;"
maxlength="40"
show-word-limit
></el-input>
</el-col>
</el-form-item>
<div class="inline">
<el-form-item label="适用科室" prop="department" class="required-label">
<el-input
size="small"
v-model="formData1.department"
placeholder="请输入适用科室"
:disabled="idMedicEdit"
></el-input>
</el-form-item>
<el-form-item label="治疗疾病" prop="treatDisease" class="required-label">
<el-col :span="24">
<el-input
size="small"
v-model="formData1.treatDisease"
placeholder="请输入治疗疾病"
:disabled="idMedicEdit"
></el-input>
<span class="word-num"></span>
</el-col>
</el-form-item>
</div>
<el-form-item label="商品使用时间" prop="rangeTime" class="required-label">
<el-col :span="8">
<el-date-picker
v-model="rangeTime"
type="daterange"
value-format="yyyy-MM-dd"
start-placeholder="开始日期"
end-placeholder="结束日期"
:disabled="idMedicEdit"
>
</el-date-picker>
</el-col>
</el-form-item>
<el-form-item label="说明书">
<el-upload
class="bg-uploader"
action="#"
:show-file-list="false"
:before-upload="beforeUploadPic1"
>
<div v-if="fileIntrList.length > 0">
<div class="file-pics" v-if="item.url" :key="index" v-for="(item,index) in fileIntrList">
<img :src="item.url" @mouseover.stop="intrIndex=index" class="bg-img"/>
<div
class="img-delete"
v-if="intrIndex==index"
@click.stop="deleteImg(item,fileIntrList)"
@mouseout.stop="intrIndex=-1"
>
<i class="el-icon-delete"></i>
</div>
</div>
</div>
<img class="bg-img" src="../../assets/image/small.png" />
<div class="limit-text">
<p>限制大小: 2M</p>
<!-- <p>最小尺寸：750*420</p> -->
<p>支持jpeg, png格式</p>
</div>
</el-upload>
<p class="upload-message" v-if="!isSpecification_url">请上传说明书</p>
</el-form-item>
</div>
</el-form>
<!-- =========================================================调试新增检测服务 start========================================================= <!-- =========================================================调试新增检测服务 start=========================================================
=========================================================调试新增检测服务 start========================================================= =========================================================调试新增检测服务 start=========================================================
=========================================================调试新增检测服务 start========================================================= --> =========================================================调试新增检测服务 start========================================================= -->
<!-- 服务信息 -->
<el-form <el-form
ref="formData2" ref="formData2"
:model="formData2" :model="formData2"
...@@ -513,7 +590,7 @@ ...@@ -513,7 +590,7 @@
label-suffix="：" label-suffix="："
class="basic-form" class="basic-form"
> >
<div class="basic-item-icon" v-show="!isMedic && isCheckServe"> <div class="basic-item-icon" v-show="!isMedic && isCheckServe && !showTcm">
<div class="part-tit">服务信息</div> <div class="part-tit">服务信息</div>
<el-form-item label="条形码" prop="barCode"> <el-form-item label="条形码" prop="barCode">
<el-col :span="18"> <el-col :span="18">
...@@ -703,26 +780,12 @@ ...@@ -703,26 +780,12 @@
</div> </div>
</el-form> </el-form>
<!-- =========================================================调试新增检测服务 start========================================================= <!-- =========================================================调试新增检测服务 start=========================================================
=========================================================调试新增检测服务 start========================================================= =========================================================调试新增检测服务 start=========================================================
=========================================================调试新增检测服务 start========================================================= --> =========================================================调试新增检测服务 start========================================================= -->
<!-- 销售信息 -->
<el-form <el-form
ref="formData" ref="formData"
:model="formData" :model="formData"
...@@ -753,7 +816,7 @@ ...@@ -753,7 +816,7 @@
<div class="inline" v-if="formData.saleType == 2"> <div class="inline" v-if="formData.saleType == 2">
<el-form-item label="批发价" prop="optPrice"> <el-form-item label="批发价" prop="optPrice">
<el-col :span="20"> <el-col :span="20">
<el-input-number class="stock-com" @input="$forceUpdate();" v-model="formData.optPrice" size="small" :precision="2" :min="0" :max="99999.99"></el-input-number> <el-input-number class="stock-com" @input="$forceUpdate();" v-model="formData.optPrice" size="small" :precision="2" :min="0" :max="20000000.00"></el-input-number>
</el-col> </el-col>
</el-form-item> </el-form-item>
</div> </div>
...@@ -1048,6 +1111,13 @@ ...@@ -1048,6 +1111,13 @@
contractList: [], // 合同 contractList: [], // 合同
isProject: false, // 是否选择合作项目 isProject: false, // 是否选择合作项目
isContract: false, // 是否选择合同 isContract: false, // 是否选择合同
showTcm:false,
rangeTime:'',
// pickerOptions: {
// disabledDate: (time) => {
// return time.getTime() > new Date().getTime(); //减去一天的时间代表可以选择同一天;
// },
// },
} }
}, },
computed: { computed: {
...@@ -1111,6 +1181,7 @@ ...@@ -1111,6 +1181,7 @@
if (this.formData.incrType == null || this.formData.incrType === '') { if (this.formData.incrType == null || this.formData.incrType === '') {
this.formData.incrType = 2; this.formData.incrType = 2;
} }
console.log('save');
}, },
methods: { methods: {
// 获取合同 // 获取合同
...@@ -1262,6 +1333,12 @@ ...@@ -1262,6 +1333,12 @@
if(this.isProject) {this.getContractList(cooperationProjectId)} if(this.isProject) {this.getContractList(cooperationProjectId)}
this.isContract = Boolean(contractId); this.isContract = Boolean(contractId);
this.formData1 = goodDet; this.formData1 = goodDet;
if (this.formData1.goodsType == 340) {
this.showTcm = true;
if (this.formData1.useBeginTime && this.formData1.useEndTime) {
this.rangeTime = [new Date(this.formData1.useBeginTime).format("yyyy-MM-dd"), new Date(this.formData1.useEndTime).format("yyyy-MM-dd")]
}
}
this.formData = goodDet; this.formData = goodDet;
this.formData3 = { goodsName, goodsDescription, goodsHeaderImages, goodsVideoList, goodsType, expressLimitFlag,contractId, cooperationProjectId }; this.formData3 = { goodsName, goodsDescription, goodsHeaderImages, goodsVideoList, goodsType, expressLimitFlag,contractId, cooperationProjectId };
this.hasRepoFlag = hasRepoFlag; this.hasRepoFlag = hasRepoFlag;
...@@ -1410,6 +1487,7 @@ ...@@ -1410,6 +1487,7 @@
this.goodsType = goodsType; this.goodsType = goodsType;
if(goodsType == 337){ if(goodsType == 337){
this.isMedic = false; this.isMedic = false;
this.showTcm = false;
this.isCheckServe = true; this.isCheckServe = true;
getHospitalInfoByStoreId(this.storeId).then(({code,message,data})=>{ getHospitalInfoByStoreId(this.storeId).then(({code,message,data})=>{
this.formData2.hospitalName = data.hospital; this.formData2.hospitalName = data.hospital;
...@@ -1419,10 +1497,16 @@ ...@@ -1419,10 +1497,16 @@
this.checkPackageIdList = res.data; this.checkPackageIdList = res.data;
}) })
}else{ }else{
this.isMedic = goodsType == '5'; if (goodsType == 340) {
this.isCheckServe = false; this.showTcm = true;
this.getLever(goodsType,type); }else {
this.isMedic = goodsType == '5';
this.isCheckServe = false;
this.showTcm = false;
this.getLever(goodsType,type);
}
} }
console.log(goodsType,type);
console.log(this.formData); console.log(this.formData);
}, },
defaultArr(){ defaultArr(){
...@@ -1529,6 +1613,15 @@ ...@@ -1529,6 +1613,15 @@
}, },
complete() { complete() {
if (this.goodsType == 340 ) {
this.formData1.otc1 = "0";
}
console.log(this.formData1);
console.log(this.rangeTime);
this.formData1.useBeginTime = new Date(this.rangeTime ? this.rangeTime[0] + ' ' + '00:00:00' : '').getTime() || '';
this.formData1.useEndTime = new Date(this.rangeTime ? this.rangeTime[1] + ' ' + '23:59:59' : '').getTime() || '';
console.log('==============');
// debugger;
this.formData1.leastCount = this.formData.leastCount; this.formData1.leastCount = this.formData.leastCount;
this.formData1.mostCount = this.formData.mostCount; this.formData1.mostCount = this.formData.mostCount;
let formNameList = ['formData', 'formData1', 'formData2', 'formData3']; let formNameList = ['formData', 'formData1', 'formData2', 'formData3'];
...@@ -1607,11 +1700,11 @@ ...@@ -1607,11 +1700,11 @@
return; return;
} }
} }
if(!isTrue){ if(!isTrue){
return false; return false;
}else{ }else{
this.formData.costPrice = signFigures(this.formData.optPrice*100); this.formData.costPrice = signFigures(this.formData.optPrice*100, 10);
this.formData.hasChanged = true; this.formData.hasChanged = true;
this.formData.inputType = this.inputType; this.formData.inputType = this.inputType;
this.updateGoodsInfo(); this.updateGoodsInfo();
......
src/views/shop/create-shop.vue
浏览文件 @ 09c15d60
...@@ -1935,6 +1935,7 @@ export default { ...@@ -1935,6 +1935,7 @@ export default {
}, },
completeWholeForm() { completeWholeForm() {
console.log(this.controlLicense,this.formData); console.log(this.controlLicense,this.formData);
this.formData.certifyReq.certifyLicenseImgList = this.formData.certifyReq.certifyLicenseImgList || [];
if(!this.imgUrlP7Show){ if(!this.imgUrlP7Show){
this.formData.imgUrlP7 = '' this.formData.imgUrlP7 = ''
this.formData.certifyReq.certifyLicenseImgList.forEach((v,i)=>{ this.formData.certifyReq.certifyLicenseImgList.forEach((v,i)=>{
...@@ -1975,6 +1976,7 @@ export default { ...@@ -1975,6 +1976,7 @@ export default {
} }
}) })
} }
this.resetCertType();
let flag = this.submitForm(); let flag = this.submitForm();
if (flag && this.certifyStatus == 3) { if (flag && this.certifyStatus == 3) {
this.$confirm('您的店铺已经审核通过，重新提交后需要重新审核。', '确认重新提交店铺信息吗?', { this.$confirm('您的店铺已经审核通过，重新提交后需要重新审核。', '确认重新提交店铺信息吗?', {
...@@ -2007,8 +2009,8 @@ export default { ...@@ -2007,8 +2009,8 @@ export default {
}); });
}); });
}else if(flag) { }else if(flag) {
this.formData.storeType = Number(this.formData.storeType); this.formData.storeType = Number(this.formData.storeType);
this.formData.storeEntry = "PCKAIDIAN"; // 添加店铺渠道 this.formData.storeEntry = "PCKAIDIAN"; // 添加店铺渠道
const {bizScope, areaStr} = this.formData.certifyReq; const {bizScope, areaStr} = this.formData.certifyReq;
const result = deepCopy(this.formData); const result = deepCopy(this.formData);
result.certifyReq.areaStr = JSON.stringify(areaStr); result.certifyReq.areaStr = JSON.stringify(areaStr);
...@@ -2885,6 +2887,22 @@ export default { ...@@ -2885,6 +2887,22 @@ export default {
const s = {...query, currentTab: this.activeTabName}; const s = {...query, currentTab: this.activeTabName};
vm.$router.push({ path: "create-shop", query: s}); vm.$router.push({ path: "create-shop", query: s});
}, },
resetCertType() {
console.log('this.formData.certifyReq.certType == 1');
console.log(this.formData.certifyReq.certType == 1);
if(this.formData.certifyReq.certType == 1) {
console.log('papsdpapspd');
this.formData.imgUrlC4 = '';
this.formData.imgUrlC5 = '';
this.formData.certifyReq.assignorCertBackUrl = '';
this.formData.certifyReq.assignorCertFrontUrl = '';
this.formData.certifyReq.assignorLetterUrl = '';
this.formData.certifyReq.assignorName = '';
this.formData.certifyReq.assignorCertNo = '';
this.formData.imgUrlC5Date = '';
this.formData.imgUrlP5 = '';
}
},
handleRegionChange(v) { handleRegionChange(v) {
const checkedNodes = this.$refs['regionCascader'].getCheckedNodes()[0]; const checkedNodes = this.$refs['regionCascader'].getCheckedNodes()[0];
const n = []; const n = [];
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或