代码备份

test
anthonywj 2 years ago
parent d20f4d533b
commit 25761cf156

@ -15,13 +15,13 @@ ENV = 'production'
# VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_SPMS_SERVER/' # VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_SPMS_SERVER/'
# 平潭 # 平潭
VUE_APP_BASE_API = 'http://121.204.169.96:9150/UDI_SPMS_SERVER/' # VUE_APP_BASE_API = 'http://121.204.169.96:9150/UDI_SPMS_SERVER/'
# 文明懂 # 文明懂
# VUE_APP_BASE_API = 'http://192.168.0.62:9150/UDI_SPMS_SERVER/' # VUE_APP_BASE_API = 'http://192.168.0.62:9150/UDI_SPMS_SERVER/'
# 刘恩典 # 刘恩典
# VUE_APP_BASE_API = 'http://192.168.0.243:9150/UDI_SPMS_SERVER/' VUE_APP_BASE_API = 'http://192.168.0.243:9150/UDI_SPMS_SERVER/'
# 漳州中医院 # 漳州中医院
# VUE_APP_BASE_API = 'http://116.204.116.198:9150/UDI_SPMS_SERVER/' # VUE_APP_BASE_API = 'http://116.204.116.198:9150/UDI_SPMS_SERVER/'

@ -529,10 +529,11 @@
<el-select v-model="inputQuery.checkWebNew" style="width: 75%" :disabled="!inputQuery.checkEnable" <el-select v-model="inputQuery.checkWebNew" style="width: 75%" :disabled="!inputQuery.checkEnable"
placeholder="是否启用" placeholder="是否启用"
> >
<el-option label="无业务单扫码拣货" :value="0"></el-option> <el-option label="扫码直接生成业务单" :value="0"></el-option>
<el-option label="有业务单有三期拣货" :value="1"></el-option> <el-option label="有三期业务单配/拣货" :value="1"></el-option>
<el-option label="有业务单无三期拣货" :value="2"></el-option> <el-option label="无三期业务单配/拣货" :value="2"></el-option>
<el-option label="有业务单拣货(有无三期)" :value="3"></el-option> <el-option label="有三期业务单校验" :value="3"></el-option>
<el-option label="业务单自动生成扫码单" :value="4"></el-option>
</el-select> </el-select>
</el-col> </el-col>
@ -552,10 +553,11 @@
<el-select v-model="inputQuery.checkPdaUn" style="width: 75%" :disabled="!inputQuery.checkEnable" <el-select v-model="inputQuery.checkPdaUn" style="width: 75%" :disabled="!inputQuery.checkEnable"
placeholder="是否启用" placeholder="是否启用"
> >
<el-option label="无业务单扫码拣货" :value="0"></el-option> <el-option label="扫码直接生成业务单" :value="0"></el-option>
<el-option label="有业务单有三期拣货" :value="1"></el-option> <el-option label="有三期业务单配/拣货" :value="1"></el-option>
<el-option label="有业务单无三期拣货" :value="2"></el-option> <el-option label="无三期业务单配/拣货" :value="2"></el-option>
<el-option label="有业务单拣货(有无三期)" :value="3"></el-option> <el-option label="有三期业务单校验" :value="3"></el-option>
<el-option label="业务单自动生成扫码单" :value="4"></el-option>
</el-select> </el-select>
</el-col> </el-col>
@ -575,10 +577,11 @@
<el-select v-model="inputQuery.checkPdaEd" style="width: 75%" :disabled="!inputQuery.checkEnable" <el-select v-model="inputQuery.checkPdaEd" style="width: 75%" :disabled="!inputQuery.checkEnable"
placeholder="是否启用" placeholder="是否启用"
> >
<el-option label="无业务单扫码拣货" :value="0"></el-option> <el-option label="扫码直接生成业务单" :value="0"></el-option>
<el-option label="有业务单有三期拣货" :value="1"></el-option> <el-option label="有三期业务单配/拣货" :value="1"></el-option>
<el-option label="有业务单无三期拣货" :value="2"></el-option> <el-option label="无三期业务单配/拣货" :value="2"></el-option>
<el-option label="有业务单拣货(有无三期)" :value="3"></el-option> <el-option label="有三期业务单校验" :value="3"></el-option>
<el-option label="业务单自动生成扫码单" :value="4"></el-option>
</el-select> </el-select>
</el-col> </el-col>
@ -598,10 +601,11 @@
<el-select v-model="inputQuery.checkUdims" style="width: 75%" :disabled="!inputQuery.checkEnable" <el-select v-model="inputQuery.checkUdims" style="width: 75%" :disabled="!inputQuery.checkEnable"
placeholder="是否启用" placeholder="是否启用"
> >
<el-option label="无业务单扫码拣货" :value="0"></el-option> <el-option label="扫码直接生成业务单" :value="0"></el-option>
<el-option label="有业务单有三期拣货" :value="1"></el-option> <el-option label="有三期业务单配/拣货" :value="1"></el-option>
<el-option label="有业务单无三期拣货" :value="2"></el-option> <el-option label="无三期业务单配/拣货" :value="2"></el-option>
<el-option label="有业务单拣货(有无三期)" :value="3"></el-option> <el-option label="有三期业务单校验" :value="3"></el-option>
<el-option label="业务单自动生成扫码单" :value="4"></el-option>
</el-select> </el-select>
</el-col> </el-col>
@ -621,10 +625,11 @@
<el-select v-model="inputQuery.checkPc" style="width: 75%" :disabled="!inputQuery.checkEnable" <el-select v-model="inputQuery.checkPc" style="width: 75%" :disabled="!inputQuery.checkEnable"
placeholder="是否启用" placeholder="是否启用"
> >
<el-option label="无业务单扫码拣货" :value="0"></el-option> <el-option label="扫码直接生成业务单" :value="0"></el-option>
<el-option label="有业务单有三期拣货" :value="1"></el-option> <el-option label="有三期业务单配/拣货" :value="1"></el-option>
<el-option label="有业务单无三期拣货" :value="2"></el-option> <el-option label="无三期业务单配/拣货" :value="2"></el-option>
<el-option label="有业务单拣货(有无三期)" :value="3"></el-option> <el-option label="有三期业务单校验" :value="3"></el-option>
<el-option label="业务单自动生成扫码单" :value="4"></el-option>
</el-select> </el-select>
</el-col> </el-col>
@ -644,11 +649,11 @@
<el-select v-model="inputQuery.checkSp" style="width: 75%" :disabled="!inputQuery.checkEnable" <el-select v-model="inputQuery.checkSp" style="width: 75%" :disabled="!inputQuery.checkEnable"
placeholder="是否启用" placeholder="是否启用"
> >
<el-option label="无业务单扫码拣货" :value="0"></el-option> <el-option label="扫码直接生成业务单" :value="0"></el-option>
<el-option label="有业务单有三期拣货" :value="1"></el-option> <el-option label="有三期业务单配/拣货" :value="1"></el-option>
<el-option label="有业务单无三期拣货" :value="2"></el-option> <el-option label="无三期业务单配/拣货" :value="2"></el-option>
<el-option label="有业务单拣货(有无三期)" :value="3"></el-option> <el-option label="有三期业务单校验" :value="3"></el-option>
<el-option label="业务单自动生成扫码单" :value="4"></el-option>
</el-select> </el-select>
</el-col> </el-col>
<el-divider direction="vertical"></el-divider> <el-divider direction="vertical"></el-divider>
@ -666,10 +671,11 @@
<el-select v-model="inputQuery.checkChange" style="width: 75%" :disabled="!inputQuery.checkEnable" <el-select v-model="inputQuery.checkChange" style="width: 75%" :disabled="!inputQuery.checkEnable"
placeholder="是否启用" placeholder="是否启用"
> >
<el-option label="无业务单扫码拣货" :value="0"></el-option> <el-option label="扫码直接生成业务单" :value="0"></el-option>
<el-option label="有业务单有三期拣货" :value="1"></el-option> <el-option label="有三期业务单配/拣货" :value="1"></el-option>
<el-option label="有业务单无三期拣货" :value="2"></el-option> <el-option label="无三期业务单配/拣货" :value="2"></el-option>
<el-option label="有业务单拣货(有无三期)" :value="3"></el-option> <el-option label="有三期业务单校验" :value="3"></el-option>
<el-option label="业务单自动生成扫码单" :value="4"></el-option>
</el-select> </el-select>
</el-col> </el-col>
@ -689,11 +695,11 @@
<el-select v-model="inputQuery.checkBalance" :disabled="!inputQuery.checkEnable" style="width: 75%" <el-select v-model="inputQuery.checkBalance" :disabled="!inputQuery.checkEnable" style="width: 75%"
placeholder="是否启用" placeholder="是否启用"
> >
<el-option label="无业务单扫码拣货" :value="0"></el-option> <el-option label="扫码直接生成业务单" :value="0"></el-option>
<el-option label="有业务单有三期拣货" :value="1"></el-option> <el-option label="有三期业务单配/拣货" :value="1"></el-option>
<el-option label="有业务单无三期拣货" :value="2"></el-option> <el-option label="无三期业务单配/拣货" :value="2"></el-option>
<el-option label="有业务单拣货(有无三期)" :value="3"></el-option> <el-option label="有三期业务单校验" :value="3"></el-option>
<el-option label="业务单自动生成扫码单" :value="4"></el-option>
</el-select> </el-select>
</el-col> </el-col>
<el-divider direction="vertical"></el-divider> <el-divider direction="vertical"></el-divider>
@ -711,10 +717,11 @@
<el-select v-model="inputQuery.checkCopy" style="width: 75%" :disabled="!inputQuery.checkEnable" <el-select v-model="inputQuery.checkCopy" style="width: 75%" :disabled="!inputQuery.checkEnable"
placeholder="是否启用" placeholder="是否启用"
> >
<el-option label="无业务单扫码拣货" :value="0"></el-option> <el-option label="扫码直接生成业务单" :value="0"></el-option>
<el-option label="有业务单有三期拣货" :value="1"></el-option> <el-option label="有三期业务单配/拣货" :value="1"></el-option>
<el-option label="有业务单无三期拣货" :value="2"></el-option> <el-option label="无三期业务单配/拣货" :value="2"></el-option>
<el-option label="有业务单拣货(有无三期)" :value="3"></el-option> <el-option label="有三期业务单校验" :value="3"></el-option>
<el-option label="业务单自动生成扫码单" :value="4"></el-option>
</el-select> </el-select>
</el-col> </el-col>

@ -107,7 +107,8 @@
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item class="query-form-item" label="备注:"> <el-form-item class="query-form-item" label="备注:">
<el-input v-model="filterQuery.unionRemark" placeholder="请输入备注" style="width: 90%" clearable="true"></el-input> <el-input v-model="filterQuery.unionRemark" placeholder="请输入备注" style="width: 90%"
clearable="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -339,9 +340,10 @@
> >
<el-table-column label="序号" type="index"></el-table-column> <el-table-column label="序号" type="index"></el-table-column>
<el-table-column <el-table-column
label="发票码" width="150" label="发票码" width="150"
prop="invoiceCode" prop="invoiceEncode"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="物资名称" label="物资名称"
prop="cpmctymc" width="150" prop="cpmctymc" width="150"
@ -357,15 +359,15 @@
prop="batchNo" prop="batchNo"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
<el-table-column
label="发票代码" width="150"
prop="invoiceCode"
></el-table-column>
<el-table-column <el-table-column
label="机器编码" width="150" label="机器编码" width="150"
prop="machineNo" prop="machineNo"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
<el-table-column
label="发票编码" width="150"
prop="invoiceEncode"
></el-table-column>
<el-table-column <el-table-column
label="开票日期" width="150" label="开票日期" width="150"
prop="invoiceDate" prop="invoiceDate"

@ -89,13 +89,16 @@
<el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button> <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
<el-button type="primary" icon="el-icon-search" @click="searchList" size="mini">查询</el-button> <el-button type="primary" icon="el-icon-search" @click="searchList" size="mini">查询</el-button>
<el-button type="primary" icon="el-icon-refresh" @click="getSuperSeaech" size="mini">国家同步库查询</el-button> <el-button type="primary" icon="el-icon-refresh" @click="getSuperSeaech" size="mini">国家同步库查询</el-button>
<el-button type="primary" size="mini" icon="el-icon-bottom-right" @click="checkCombine" :loading="combineLoading">选入</el-button> <el-button type="primary" size="mini" icon="el-icon-bottom-right" @click="checkCombine"
:loading="combineLoading">选入
</el-button>
</el-button-group> </el-button-group>
</div> </div>
<el-divider style="margin: 15px"></el-divider> <el-divider style="margin: 15px"></el-divider>
<el-table :data="udidlList" style="width: 100%" v-loading="loading" border highlight-current-row="true" :row-class-name="tableRowClassName" @current-change="handleErpChange" ref="diList"> <el-table :data="udidlList" style="width: 100%" v-loading="loading" border highlight-current-row="true"
:row-class-name="tableRowClassName" @current-change="handleErpChange" ref="diList">
<el-table-column label="序号" type="index"></el-table-column> <el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="产品标识" prop="nameCode" show-overflow-tooltip></el-table-column> <el-table-column label="产品标识" prop="nameCode" show-overflow-tooltip></el-table-column>
<el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip></el-table-column> <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>
@ -154,7 +157,8 @@
</el-col> </el-col>
<el-col :span="12" class="el-col"> <el-col :span="12" class="el-col">
<el-form-item label="医保编码:"> <el-form-item label="医保编码:">
<el-input style="width: 65%" size="small" splaceholder="请输入内容" v-model="editQuery.ybbm" @input="change($event)"></el-input> <el-input style="width: 65%" size="small" splaceholder="请输入内容" v-model="editQuery.ybbm"
@input="change($event)"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -167,7 +171,8 @@
</el-col> </el-col>
<el-col :span="12" class="el-col"> <el-col :span="12" class="el-col">
<el-form-item label="生产企业:"> <el-form-item label="生产企业:">
<el-input style="width: 65%" size="small" v-model="editQuery.manufactory" splaceholder="请输入内容" @input="change($event)"></el-input> <el-input style="width: 65%" size="small" v-model="editQuery.manufactory" splaceholder="请输入内容"
@input="change($event)"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -188,7 +193,8 @@
<el-row> <el-row>
<el-col :span="12" class="el-col"> <el-col :span="12" class="el-col">
<el-form-item label="产品价格:"> <el-form-item label="产品价格:">
<el-input style="width: 65%" size="small" splaceholder="请输入内容" type="number" step="0.01" v-model="editQuery.price"></el-input> <el-input style="width: 65%" size="small" splaceholder="请输入内容" type="number" step="0.01"
v-model="editQuery.price"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -196,13 +202,15 @@
<el-row> <el-row>
<el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable1"> <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable1">
<el-form-item :label="productRemarkSet.remarkTitle1 "> <el-form-item :label="productRemarkSet.remarkTitle1 ">
<el-input style="width: 65%" size="small" splaceholder="请输入内容" v-model="editQuery.basicPrductRemak1"></el-input> <el-input style="width: 65%" size="small" splaceholder="请输入内容"
v-model="editQuery.basicPrductRemak1"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable2"> <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable2">
<el-form-item :label="productRemarkSet.remarkTitle2 "> <el-form-item :label="productRemarkSet.remarkTitle2 ">
<el-input style="width: 65%" size="small" splaceholder="请输入内容" v-model="editQuery.basicPrductRemak2"></el-input> <el-input style="width: 65%" size="small" splaceholder="请输入内容"
v-model="editQuery.basicPrductRemak2"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -210,13 +218,15 @@
<el-row> <el-row>
<el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable3"> <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable3">
<el-form-item :label="productRemarkSet.remarkTitle3 "> <el-form-item :label="productRemarkSet.remarkTitle3 ">
<el-input style="width: 65%" size="small" splaceholder="请输入内容" v-model="editQuery.basicPrductRemak3"></el-input> <el-input style="width: 65%" size="small" splaceholder="请输入内容"
v-model="editQuery.basicPrductRemak3"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable4"> <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable4">
<el-form-item :label="productRemarkSet.remarkTitle4 "> <el-form-item :label="productRemarkSet.remarkTitle4 ">
<el-input style="width: 65%" size="small" splaceholder="请输入内容" v-model="editQuery.basicPrductRemak4"></el-input> <el-input style="width: 65%" size="small" splaceholder="请输入内容"
v-model="editQuery.basicPrductRemak4"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -224,13 +234,15 @@
<el-row> <el-row>
<el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable5"> <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable5">
<el-form-item :label="productRemarkSet.remarkTitle5 "> <el-form-item :label="productRemarkSet.remarkTitle5 ">
<el-input style="width: 65%" size="small" splaceholder="请输入内容" v-model="editQuery.basicPrductRemak5"></el-input> <el-input style="width: 65%" size="small" splaceholder="请输入内容"
v-model="editQuery.basicPrductRemak5"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable6"> <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable6">
<el-form-item :label="productRemarkSet.remarkTitle6 "> <el-form-item :label="productRemarkSet.remarkTitle6 ">
<el-input style="width: 65%" size="small" splaceholder="请输入内容" v-model="editQuery.basicPrductRemak6"></el-input> <el-input style="width: 65%" size="small" splaceholder="请输入内容"
v-model="editQuery.basicPrductRemak6"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -238,13 +250,15 @@
<el-row> <el-row>
<el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable7"> <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable7">
<el-form-item :label="productRemarkSet.remarkTitle7 "> <el-form-item :label="productRemarkSet.remarkTitle7 ">
<el-input style="width: 65%" size="small" splaceholder="请输入内容" v-model="editQuery.basicPrductRemak7"></el-input> <el-input style="width: 65%" size="small" splaceholder="请输入内容"
v-model="editQuery.basicPrductRemak7"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable8"> <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable8">
<el-form-item :label="productRemarkSet.remarkTitle8"> <el-form-item :label="productRemarkSet.remarkTitle8">
<el-input style="width: 65%" size="small" splaceholder="请输入内容" v-model="editQuery.basicPrductRemak8"></el-input> <el-input style="width: 65%" size="small" splaceholder="请输入内容"
v-model="editQuery.basicPrductRemak8"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -350,6 +364,7 @@ export default {
measname: null, measname: null,
sptm: null, sptm: null,
uuids: null, uuids: null,
devKeys: [],
customerId: store.getters.customerId customerId: store.getters.customerId
}, },
@ -499,7 +514,10 @@ export default {
} }
let uuids = [] let uuids = []
uuids.push(this.curSelectDi.uuid) uuids.push(this.curSelectDi.uuid)
let devKeys = []
devKeys.push(this.curSelectDi.deviceRecordKey)
this.editQuery.uuids = uuids this.editQuery.uuids = uuids
this.editQuery.devKeys = devKeys
addDiProduct(this.editQuery).then((res) => { addDiProduct(this.editQuery).then((res) => {
if (res.code === 20000) { if (res.code === 20000) {
this.$message.success('添加成功') this.$message.success('添加成功')

Loading…
Cancel
Save