wilson
/
rongxing-vue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

master
rui_li 4 years ago
parent
9087e41764 aec4f18d2f
commit
ee6411c714
8 changed files with 28 additions and 24 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. 6
      src/views/modules/auditManagement/auditRules.vue
  2. 6
      src/views/modules/auditManagement/auditTeam.vue
  3. 6
      src/views/modules/auditManagement/auditType.vue
  4. 4
      src/views/modules/knifemold/receive.vue
  5. 6
      src/views/modules/purchaseorder/procurementReview.vue
  6. 6
      src/views/modules/purchaseorder/purchaseRequisition.vue
  7. 12
      src/views/modules/warehouse/location.vue
  8. 6
      src/views/modules/warehouse/warehouse.vue

6
src/views/modules/auditManagement/auditRules.vue
View File

@ -5,7 +5,7 @@
<icon-svg :name="favorite?'xiangqufill':'xiangqu'" class="sl-svg" ></icon-svg> <icon-svg :name="favorite?'xiangqufill':'xiangqu'" class="sl-svg" ></icon-svg>
</span> </span>
</div> </div>
<el-form :inline="true" :model="querySysLanguagePack" @keyup.enter.native="getDataList()">
<el-form :inline="true" label-position="top">
<el-form-item :label="inputSearch1"> <el-form-item :label="inputSearch1">
<el-input style="width: 110px;" placeholder="" v-model="mainQueryData.recordTypeDb"></el-input> <el-input style="width: 110px;" placeholder="" v-model="mainQueryData.recordTypeDb"></el-input>
</el-form-item> </el-form-item>
@ -30,7 +30,7 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item>
<el-form-item style="margin-top: 20px;">
<el-button @click="getDataList()" type="primary">{{buttons.search}}</el-button> <el-button @click="getDataList()" type="primary">{{buttons.search}}</el-button>
<el-button @click="initModel()" type="primary">{{buttons.add}}</el-button> <el-button @click="initModel()" type="primary">{{buttons.add}}</el-button>
<el-button @click="saveColumnList()" type="primary" v-show="showDefault">{{buttons.defaultTable}} <el-button @click="saveColumnList()" type="primary" v-show="showDefault">{{buttons.defaultTable}}
@ -816,7 +816,7 @@ import {
}, },
mounted() { mounted() {
this.$nextTick(()=>{ this.$nextTick(()=>{
this.height = window.innerHeight - 255;
this.height = window.innerHeight - 200;
}) })
}, },
activated() { activated() {

6
src/views/modules/auditManagement/auditTeam.vue
View File

@ -5,7 +5,7 @@
<icon-svg :name="favorite?'xiangqufill':'xiangqu'" class="sl-svg" ></icon-svg> <icon-svg :name="favorite?'xiangqufill':'xiangqu'" class="sl-svg" ></icon-svg>
</span> </span>
</div> </div>
<el-form :inline="true" :model="querySysLanguagePack" @keyup.enter.native="getDataList()">
<el-form :inline="true" label-position="top">
<el-form-item :label="inputSearch1"> <el-form-item :label="inputSearch1">
<el-input style="width: 110px;" clearable placeholder="" v-model="mainQueryData.recordTypeDb"></el-input> <el-input style="width: 110px;" clearable placeholder="" v-model="mainQueryData.recordTypeDb"></el-input>
</el-form-item> </el-form-item>
@ -30,7 +30,7 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item>
<el-form-item style="margin-top: 20px;">
<el-button @click="getDataList()" type="primary">{{buttons.search}}</el-button> <el-button @click="getDataList()" type="primary">{{buttons.search}}</el-button>
<el-button @click="initModel()" type="primary">{{buttons.add}}</el-button> <el-button @click="initModel()" type="primary">{{buttons.add}}</el-button>
<el-button @click="saveColumnList()" type="primary" v-show="showDefault">{{buttons.defaultTable}} <el-button @click="saveColumnList()" type="primary" v-show="showDefault">{{buttons.defaultTable}}
@ -559,7 +559,7 @@ import {
}, },
mounted() { mounted() {
this.$nextTick(()=>{ this.$nextTick(()=>{
this.height = window.innerHeight - 255;
this.height = window.innerHeight - 200;
}) })
}, },
activated() { activated() {

6
src/views/modules/auditManagement/auditType.vue
View File

@ -5,7 +5,7 @@
<icon-svg :name="favorite?'xiangqufill':'xiangqu'" class="sl-svg" ></icon-svg> <icon-svg :name="favorite?'xiangqufill':'xiangqu'" class="sl-svg" ></icon-svg>
</span> </span>
</div> </div>
<el-form :inline="true" :model="querySysLanguagePack" @keyup.enter.native="getDataList()">
<el-form :inline="true" label-position="top">
<el-form-item :label="inputSearch1"> <el-form-item :label="inputSearch1">
<el-input style="width: 110px;" clearable placeholder="" v-model="mainQueryData.roleDesc"></el-input> <el-input style="width: 110px;" clearable placeholder="" v-model="mainQueryData.roleDesc"></el-input>
</el-form-item> </el-form-item>
@ -24,7 +24,7 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item>
<el-form-item style="margin-top: 20px;">
<el-button @click="getDataList()" type="primary">{{buttons.search}}</el-button> <el-button @click="getDataList()" type="primary">{{buttons.search}}</el-button>
<el-button @click="initModel()" type="primary">{{buttons.add}}</el-button> <el-button @click="initModel()" type="primary">{{buttons.add}}</el-button>
<el-button @click="saveColumnList()" type="primary" v-show="showDefault">{{buttons.defaultTable}} <el-button @click="saveColumnList()" type="primary" v-show="showDefault">{{buttons.defaultTable}}
@ -525,7 +525,7 @@ import {
}, },
mounted() { mounted() {
this.$nextTick(()=>{ this.$nextTick(()=>{
this.height = window.innerHeight - 255;
this.height = window.innerHeight - 200;
}) })
}, },
activated() { activated() {

4
src/views/modules/knifemold/receive.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<div class="mod-config"> <div class="mod-config">
<el-form :inline="true" :model="querySysLanguagePack" @keyup.enter.native="getDataList()">
<el-form :inline="true" label-position="top">
<el-form-item :label = "inputSearch10"> <el-form-item :label = "inputSearch10">
<el-input style="width: 110px;" placeholder="" v-model = "queryViewIfs.transactionId"></el-input> <el-input style="width: 110px;" placeholder="" v-model = "queryViewIfs.transactionId"></el-input>
</el-form-item> </el-form-item>
@ -20,7 +20,7 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item>
<el-form-item style="margin-top: 20px;">
<el-button @click="initViewIfsTable('Y')" type="primary">{{ buttons.search }}</el-button> <el-button @click="initViewIfsTable('Y')" type="primary">{{ buttons.search }}</el-button>
<el-button @click="saveColumnList()" type="primary" v-show="showDefault">{{ buttons.defaultTable }} <el-button @click="saveColumnList()" type="primary" v-show="showDefault">{{ buttons.defaultTable }}
</el-button> </el-button>

6
src/views/modules/purchaseorder/procurementReview.vue
View File

@ -5,7 +5,7 @@
<icon-svg :name="favorite?'xiangqufill':'xiangqu'" class="sl-svg"></icon-svg> <icon-svg :name="favorite?'xiangqufill':'xiangqu'" class="sl-svg"></icon-svg>
</span> </span>
</div> </div>
<el-form :inline="true" :model="querySysLanguagePack" @keyup.enter.native="getDataList()">
<el-form :inline="true" label-position="top">
<el-form-item :label="inputSearch1"> <el-form-item :label="inputSearch1">
<el-input style="width: 110px;" clearable placeholder="" v-model="mainQueryData.requisitionno"></el-input> <el-input style="width: 110px;" clearable placeholder="" v-model="mainQueryData.requisitionno"></el-input>
@ -36,7 +36,7 @@
<el-option value="N" label="未审批"></el-option> <el-option value="N" label="未审批"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item>
<el-form-item style="margin-top: 20px;">
<el-button @click="getDataList('Y')" type="primary">{{buttons.search}}</el-button> <el-button @click="getDataList('Y')" type="primary">{{buttons.search}}</el-button>
<el-button @click="saveColumnList()" type="primary" v-show="showDefault">{{buttons.defaultTable}} <el-button @click="saveColumnList()" type="primary" v-show="showDefault">{{buttons.defaultTable}}
</el-button> </el-button>
@ -798,7 +798,7 @@
}, },
mounted() { mounted() {
this.$nextTick(() => { this.$nextTick(() => {
this.height = window.innerHeight - 240;
this.height = window.innerHeight - 200;
}) })
}, },
activated() { activated() {

6
src/views/modules/purchaseorder/purchaseRequisition.vue
View File

@ -5,7 +5,7 @@
<icon-svg :name="favorite?'xiangqufill':'xiangqu'" class="sl-svg"></icon-svg> <icon-svg :name="favorite?'xiangqufill':'xiangqu'" class="sl-svg"></icon-svg>
</span> </span>
</div> </div>
<el-form :inline="true" :model="querySysLanguagePack" @keyup.enter.native="getDataList()">
<el-form :inline="true" label-position="top">
<el-form-item :label="inputSearch1"> <el-form-item :label="inputSearch1">
<el-input style="width: 100px;" clearable placeholder="" v-model="mainQueryData.requisitionno"></el-input> <el-input style="width: 100px;" clearable placeholder="" v-model="mainQueryData.requisitionno"></el-input>
</el-form-item> </el-form-item>
@ -43,7 +43,7 @@
<el-option value="审批部分通过" label="审批部分通过"></el-option> <el-option value="审批部分通过" label="审批部分通过"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item>
<el-form-item style="margin-top: 20px;">
<el-button @click="getDataList('Y')" type="primary">{{ buttons.search }}</el-button> <el-button @click="getDataList('Y')" type="primary">{{ buttons.search }}</el-button>
<el-button @click="initAddModel(null)" type="primary">{{ buttons.addLabelName }}</el-button> <el-button @click="initAddModel(null)" type="primary">{{ buttons.addLabelName }}</el-button>
<el-button @click="saveColumnList()" type="primary" v-show="showDefault">{{ buttons.defaultTable }} <el-button @click="saveColumnList()" type="primary" v-show="showDefault">{{ buttons.defaultTable }}
@ -1072,7 +1072,7 @@ export default {
}, },
mounted() { mounted() {
this.$nextTick(() => { this.$nextTick(() => {
this.height = window.innerHeight - 230;
this.height = window.innerHeight - 200;
}) })
}, },
activated() { activated() {

12
src/views/modules/warehouse/location.vue
View File

@ -5,7 +5,7 @@
<icon-svg :name="favorite?'xiangqufill':'xiangqu'" class="sl-svg" ></icon-svg> <icon-svg :name="favorite?'xiangqufill':'xiangqu'" class="sl-svg" ></icon-svg>
</span> </span>
</div> </div>
<el-form :inline="true" :model="querySysLanguagePack" @keyup.enter.native="getDataList()">
<el-form :inline="true" label-position="top">
<el-form-item :label="inputLabel.headerInput.label1"> <el-form-item :label="inputLabel.headerInput.label1">
<el-input style="width: 100px;" v-model="queryHeaderData.locationId" ></el-input> <el-input style="width: 100px;" v-model="queryHeaderData.locationId" ></el-input>
</el-form-item> </el-form-item>
@ -34,10 +34,11 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item>
<el-form-item style="margin-top: 20px;">
<el-button @click="getDataList()" type="primary">{{buttons.search}}</el-button> <el-button @click="getDataList()" type="primary">{{buttons.search}}</el-button>
</el-form-item> </el-form-item>
<el-form-item>
<el-form-item style="margin-top: 20px;">
<el-button @click="initModel()" type="primary">{{buttons.add}}</el-button> <el-button @click="initModel()" type="primary">{{buttons.add}}</el-button>
<el-button @click="saveColumnList()" type="primary" v-show="showDefault">{{buttons.defaultTable}} <el-button @click="saveColumnList()" type="primary" v-show="showDefault">{{buttons.defaultTable}}
</el-button> </el-button>
@ -62,6 +63,9 @@
:disabled="dataListSelections.length <= 0">{{ buttons.deleteList}} :disabled="dataListSelections.length <= 0">{{ buttons.deleteList}}
</el-button> </el-button>
</el-form-item> </el-form-item>
</el-form>
<el-form>
</el-form> </el-form>
<el-table <el-table
id="commmon" id="commmon"
@ -547,7 +551,7 @@ import {
}, },
mounted() { mounted() {
this.$nextTick(()=>{ this.$nextTick(()=>{
this.height = window.innerHeight - 215;
this.height = window.innerHeight - 200;
}) })
}, },
activated() { activated() {

6
src/views/modules/warehouse/warehouse.vue
View File

@ -5,7 +5,7 @@
<icon-svg :name="favorite?'xiangqufill':'xiangqu'" class="sl-svg" ></icon-svg> <icon-svg :name="favorite?'xiangqufill':'xiangqu'" class="sl-svg" ></icon-svg>
</span> </span>
</div> </div>
<el-form :inline="true" :model="querySysLanguagePack" @keyup.enter.native="getDataList()">
<el-form :inline="true" label-position="top">
<el-form-item :label="inputLabel.headerInput.label1"> <el-form-item :label="inputLabel.headerInput.label1">
<el-input style="width: 100px;" v-model="queryHeaderData.wareHouseId" ></el-input> <el-input style="width: 100px;" v-model="queryHeaderData.wareHouseId" ></el-input>
</el-form-item> </el-form-item>
@ -23,10 +23,10 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item>
<el-form-item style="margin-top: 20px;">
<el-button @click="getDataList('Y')" type="primary">{{buttons.search}}</el-button> <el-button @click="getDataList('Y')" type="primary">{{buttons.search}}</el-button>
</el-form-item> </el-form-item>
<el-form-item>
<el-form-item style="margin-top: 20px;">
<el-button @click="initModel()" type="primary">{{buttons.add}}</el-button> <el-button @click="initModel()" type="primary">{{buttons.add}}</el-button>
<el-button @click="saveColumnList()" type="primary" v-show="showDefault">{{buttons.defaultTable}} <el-button @click="saveColumnList()" type="primary" v-show="showDefault">{{buttons.defaultTable}}
</el-button> </el-button>

Write Preview
Loading…
Cancel
Save