Skip to content

F
founder_vue
Commit e431a905 by 张超军
Options

Merge branch 'dev_zwpt' of http://47.92.108.28/changchao/founder_vue into dev_zwpt

parents d037b011 ab537164
Showing with 132 additions and 104 deletions
src/views/drFPTX/RAList.vue
...@@ -21,38 +21,41 @@ ...@@ -21,38 +21,41 @@
@click.native.prevent="clickitemdataType(2)" @click.native.prevent="clickitemdataType(2)"
>案件</el-radio> >案件</el-radio>
</el-radio-group> --> </el-radio-group> -->
<div class="headLeft" style="display: flex;"> <div
<div class='search barcode'> class="headLeft"
<div class='item'> 条码号：</div> style="display: flex;"
<el-input >
placeholder="请输入条码号" <div class='search barcode'>
v-model.trim="barcode" <div class='item'> 条码号：</div>
maxlength="23" <el-input
show-word-limit placeholder="请输入条码号"
@keyup.enter.native="search" v-model.trim="barcode"
clearable maxlength="23"
> show-word-limit
</el-input> @keyup.enter.native="search"
</div> clearable
<div class="search ljfk"> >
<div class="item">逻辑分库：</div> </el-input>
<div v-show="showType==1">
<SelectCode
codeUrl="/api/code/personLogic"
width="10.5"
:form="ruleForm"
id="logicDatabase"
></SelectCode>
</div>
<div v-show="showType==3">
<SelectCode
codeUrl="/api/code/caseLogic"
width="10.5"
:form="ruleForm"
id="logicDatabase"
></SelectCode>
</div> </div>
<!-- <el-select <div class="search ljfk">
<div class="item">逻辑分库：</div>
<div v-show="showType==1">
<SelectCode
codeUrl="/api/code/personLogic"
width="10.5"
:form="ruleForm"
id="logicDatabase"
></SelectCode>
</div>
<div v-show="showType==3">
<SelectCode
codeUrl="/api/code/caseLogic"
width="10.5"
:form="ruleForm"
id="logicDatabase"
></SelectCode>
</div>
<!-- <el-select
v-model="logicDatabase" v-model="logicDatabase"
placeholder="请选择逻辑分库" placeholder="请选择逻辑分库"
@keyup.enter.native="search" @keyup.enter.native="search"
...@@ -65,57 +68,62 @@ ...@@ -65,57 +68,62 @@
> >
</el-option> </el-option>
</el-select> --> </el-select> -->
</div> </div>
<div class='search taskNumber'> <div class='search taskNumber'>
<div class='item'>任务号：</div> <div class='item'>任务号：</div>
<el-input <el-input
placeholder="请输入任务号" placeholder="请输入任务号"
v-model.trim="taskNumber" v-model.trim="taskNumber"
@keyup.enter.native="search" @keyup.enter.native="search"
maxlength="14" maxlength="14"
show-word-limit show-word-limit
clearable clearable
>
</el-input>
</div>
<div class="search rkzt">
<div class="item">入库状态：</div>
<el-select
v-model="status"
placeholder="请选择入库状态"
@keyup.enter.native="search"
>
<el-option
v-for="item in statusoptions"
:key="item.value"
:label="item.label"
:value="item.value"
> >
</el-option> </el-input>
</el-select> </div>
</div> <div class="search rkzt">
<!-- <div class="search sjxz"> <div class="item">入库状态：</div>
<div class="item">时间选择：</div> <el-select
<el-date-picker v-model="status"
@keyup.enter.native="search" placeholder="请选择入库状态"
v-model="startEndDate" @keyup.enter.native="search"
type="daterange" >
start-placeholder="开始日期" <el-option
end-placeholder="结束日期" v-for="item in statusoptions"
:picker-options="{ :key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</div>
<div class="search sjxz">
<div class="item">时间选择：</div>
<el-date-picker
@keyup.enter.native="search"
v-model="startEndDate"
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
:picker-options="{
disabledDate: disabledDate, disabledDate: disabledDate,
}" }"
> >
</el-date-picker> </el-date-picker>
</div> --> </div>
</div> </div>
<div class="headRight"> <div class="headRight">
<el-button <el-button
class="sx" v-show="barcode!=''||ruleForm.logicDatabase!=''||taskNumber!=''||status!=null||startEndDate!=null"
@click="search" type="text"
>筛选</el-button> @click="clear"
>清空</el-button>
<el-button
class="sx"
@click="search"
>筛选</el-button>
</div>
</div> </div>
</div>
<div <div
class='head' class='head'
v-if="showType==2" v-if="showType==2"
...@@ -188,16 +196,31 @@ ...@@ -188,16 +196,31 @@
</el-option> </el-option>
</el-select> </el-select>
</div> </div>
<!-- <div class='search sjxz'> <div class='search sjxz'>
<div class='item'> 时间选择：</div> <div class='item'> 时间选择：</div>
<el-date-picker <el-date-picker
@keyup.enter.native="search"
v-model="startEndDate" v-model="startEndDate"
type="datetimerange" type="daterange"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期" end-placeholder="结束日期"
:picker-options="{
disabledDate: disabledDate,
}"
> >
</el-date-picker> </el-date-picker>
</div> --> </div>
<div class="headRight">
<el-button
v-show="barcode!=''||queryType!=''||logicDatabase!=''||status!=null||startEndDate!=null"
type="text"
@click="clear"
>清空</el-button>
<el-button
class="sx"
@click="search"
>筛选</el-button>
</div>
</div> </div>
<!-- 二 --> <!-- 二 -->
<div class="buttons"> <div class="buttons">
...@@ -207,8 +230,8 @@ ...@@ -207,8 +230,8 @@
size="small" size="small"
> >
<el-radio <el-radio
label="1" label="1"
v-if="roleArr.includes('B-2-1')" v-if="roleArr.includes('B-2-1')"
>人员 >人员
</el-radio> </el-radio>
<el-radio <el-radio
...@@ -228,7 +251,7 @@ ...@@ -228,7 +251,7 @@
type="text" type="text"
@click="clear" @click="clear"
>清空</el-button> --> >清空</el-button> -->
</div> </div>
</div> </div>
<el-divider style="background-color: #EEEEEE !important;"></el-divider> <el-divider style="background-color: #EEEEEE !important;"></el-divider>
...@@ -598,8 +621,10 @@ ...@@ -598,8 +621,10 @@
> >
<template slot-scope="scope"> <template slot-scope="scope">
<div style="display: flex;flex-direction: row;"> <div style="display: flex;flex-direction: row;">
<div v-if="scope.row.srcBarcode && scope.row.destBarcode !== ''" <div
style="margin-top:6px;margin-right: 5px;"> v-if="scope.row.srcBarcode && scope.row.destBarcode !== ''"
style="margin-top:6px;margin-right: 5px;"
>
<div style="width: 7px;height: 7px;background: #FFFFFF;border: 1px solid #006AFF;border-radius: 50%;"></div> <div style="width: 7px;height: 7px;background: #FFFFFF;border: 1px solid #006AFF;border-radius: 50%;"></div>
<div style="width: 1px;height: 15px;background: #D8D8D8;margin-left: 3px;"></div> <div style="width: 1px;height: 15px;background: #D8D8D8;margin-left: 3px;"></div>
<div style="width: 7px;height: 7px;background: #FFFFFF;border: 1px solid #006AFF;border-radius: 50%;"></div> <div style="width: 7px;height: 7px;background: #FFFFFF;border: 1px solid #006AFF;border-radius: 50%;"></div>
...@@ -609,7 +634,7 @@ ...@@ -609,7 +634,7 @@
<div>{{ scope.row.destBarcode }}</div> <div>{{ scope.row.destBarcode }}</div>
</div> </div>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -621,17 +646,19 @@ ...@@ -621,17 +646,19 @@
<template slot-scope="scope"> <template slot-scope="scope">
<div style="display: flex;flex-direction: row;"> <div style="display: flex;flex-direction: row;">
<div v-if="scope.row.srcLogicName && scope.row.destLogicName !== ''" <div
style="margin-top:6px;margin-right: 5px;"> v-if="scope.row.srcLogicName && scope.row.destLogicName !== ''"
<div style="width: 7px;height: 7px;background: #FFFFFF;border: 1px solid #006AFF;border-radius: 50%;"></div> style="margin-top:6px;margin-right: 5px;"
<div style="width: 1px;height: 15px;background: #D8D8D8;margin-left: 3px;"></div> >
<div style="width: 7px;height: 7px;background: #FFFFFF;border: 1px solid #006AFF;border-radius: 50%;"></div> <div style="width: 7px;height: 7px;background: #FFFFFF;border: 1px solid #006AFF;border-radius: 50%;"></div>
<div style="width: 1px;height: 15px;background: #D8D8D8;margin-left: 3px;"></div>
<div style="width: 7px;height: 7px;background: #FFFFFF;border: 1px solid #006AFF;border-radius: 50%;"></div>
</div> </div>
<div> <div>
<div>{{ scope.row.srcLogicName }}</div> <div>{{ scope.row.srcLogicName }}</div>
<div>{{ scope.row.destLogicName }}</div> <div>{{ scope.row.destLogicName }}</div>
</div> </div>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
...@@ -940,7 +967,7 @@ export default { ...@@ -940,7 +967,7 @@ export default {
this.selectBoo = false// 是否批量操作 this.selectBoo = false// 是否批量操作
this.isShowTip = false; this.isShowTip = false;
this.multipleSelection = []; this.multipleSelection = [];
this.search(); // this.search();
this.clear() this.clear()
}, },
}, },
...@@ -1137,6 +1164,7 @@ export default { ...@@ -1137,6 +1164,7 @@ export default {
this.status = null; // 状态 this.status = null; // 状态
this.barcode = ""; // 条码号 this.barcode = ""; // 条码号
this.ruleForm.logicDatabase = "";// 逻辑分库 this.ruleForm.logicDatabase = "";// 逻辑分库
this.logicDatabase = ''; // 逻辑分库
this.queryType = "";// 类型 this.queryType = "";// 类型
this.startEndDate = null;// 时间 this.startEndDate = null;// 时间
this.search() this.search()
...@@ -1600,9 +1628,9 @@ export default { ...@@ -1600,9 +1628,9 @@ export default {
}, },
}, },
mounted () { mounted () {
this.search();
//console.log(this.$route.query.id, 'this.$route.query.id') //console.log(this.$route.query.id, 'this.$route.query.id')
this.showType = this.$route.query.id || "1"; this.showType = this.$route.query.id || "1";
// this.search();
}, },
}; };
...@@ -1668,9 +1696,9 @@ export default { ...@@ -1668,9 +1696,9 @@ export default {
font-family: HarmonyOS_Sans_SC; font-family: HarmonyOS_Sans_SC;
color: #ffffff; color: #ffffff;
line-height: 22px; line-height: 22px;
border:none border: none;
} }
/deep/.el-radio-button .el-radio-button__inner { /deep/.el-radio-button .el-radio-button__inner {
width: 129px; width: 129px;
height: 32px; height: 32px;
...@@ -1764,6 +1792,7 @@ export default { ...@@ -1764,6 +1792,7 @@ export default {
} }
.sjxz { .sjxz {
margin-left: 24px; margin-left: 24px;
width: 370px;
.item { .item {
width: 80px; width: 80px;
font-size: 14px; font-size: 14px;
...@@ -1786,7 +1815,7 @@ export default { ...@@ -1786,7 +1815,7 @@ export default {
margin-bottom: 16px; margin-bottom: 16px;
.left { .left {
margin-top: 24px; margin-top: 24px;
.el-radio-group{ .el-radio-group {
.el-radio { .el-radio {
width: 86px; width: 86px;
height: 32px; height: 32px;
...@@ -1809,14 +1838,12 @@ export default { ...@@ -1809,14 +1838,12 @@ export default {
/deep/ .el-radio__input { /deep/ .el-radio__input {
display: none; display: none;
} }
} }
/deep/ .is-checked { /deep/ .is-checked {
background-color: #ddebff; background-color: #ddebff;
} }
} }
} }
} }
.options { .options {
......
src/views/zljc/Index.vue
...@@ -76,6 +76,7 @@ ...@@ -76,6 +76,7 @@
</div> </div>
<div class="right"> <div class="right">
<el-button <el-button
v-show="formInline.barcode!=''||formInline.inspectionFlag!=null||formInline.codeDwCode!=''||formInline.nysj!=null"
type="text" type="text"
@click="clear" @click="clear"
>清空</el-button> >清空</el-button>
......
src/views/zljc/modules/nyzw.vue
...@@ -467,7 +467,7 @@ export default { ...@@ -467,7 +467,7 @@ export default {
let self = this; let self = this;
this.$axios this.$axios
.post( .post(
"/api/png/plainByBarcode/barcode", "/api/png/plain/barcode",
{ barcode: this.rowData.barcode }, { barcode: this.rowData.barcode },
// { loading: false } // { loading: false }
) )
...@@ -502,7 +502,7 @@ export default { ...@@ -502,7 +502,7 @@ export default {
let self = this; let self = this;
this.$axios this.$axios
.post( .post(
"/api/png/rollByBarcode/barcode", "/api/png/roll/barcode",
{ barcode: this.rowData.barcode }, { barcode: this.rowData.barcode },
// { loading: false } // { loading: false }
) )
...@@ -790,7 +790,7 @@ export default { ...@@ -790,7 +790,7 @@ export default {
position: absolute; position: absolute;
left: 50%; left: 50%;
top: 50%; top: 50%;
transform:translate(-50%,-50%); transform: translate(-50%, -50%);
margin-top: -48px; /* 高度的一半 */ margin-top: -48px; /* 高度的一半 */
margin-left: -66px; /* 宽度的一半 */ margin-left: -66px; /* 宽度的一半 */
width: 132px; width: 132px;
...@@ -876,7 +876,7 @@ export default { ...@@ -876,7 +876,7 @@ export default {
position: absolute; position: absolute;
left: 50%; left: 50%;
top: 50%; top: 50%;
transform:translate(-50%,-50%); transform: translate(-50%, -50%);
margin-top: -48px; /* 高度的一半 */ margin-top: -48px; /* 高度的一半 */
margin-left: -66px; /* 宽度的一半 */ margin-left: -66px; /* 宽度的一半 */
width: 132px; width: 132px;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment