meswork/JY1.0
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://123.56.95.229:10010/r/高精

Browse Source
This commit is contained in:
hedekun
2020-02-10 15:00:08 +08:00
parent e796a69dc9 3fb3038f8e
commit e12ce46a6b
39 changed files with 253 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/views/WorkshopProcurement/OfflineProcurement/index.vue
View File

@@ -81,13 +81,8 @@
:label="item.label"
:value="item.value"/>
</el-select>
<<<<<<< HEAD
<el-button type="primary" plain size="small" icon="el-icon-search" style="margin-left: 10px" @click="pageCurrent2=1;pageSize2=10;total2=0;searchTable()">查询</el-button>
<el-button class="button111" size="small" icon="el-icon-plus" style="margin-left: 10px" @click="addPurchaseOrder">创建采购计划单</el-button>
=======
<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="searchTable()">查询</el-button>
<el-button type="primary" size="small" icon="el-icon-plus" style="margin-left: 10px" @click="addPurchaseOrder">创建采购计划单</el-button>
>>>>>>> 6d4033c92a46c968832636b84ef2c64c7b192fe4
<!--<el-tooltip :open-delay="1200" effect="dark" content="保存选中的采购计划单" placement="top">-->
<!--<el-button type="baocun" size="small" icon="el-icon-download" style="margin-left: 10px" @click="saveMateriel">保存采购计划单</el-button>-->
<!--</el-tooltip>-->

5
src/views/WorkshopProcurement/OutsourcingMaterialsSearch/index.vue
View File

@@ -20,10 +20,6 @@
:label="item.label"
:value="item.value"/>
</el-select>
<<<<<<< HEAD
<el-button icon="el-icon-search" type="primary" plain size="small" @click="pageCurrent = 1;pageSize = 100;getTableData()">查询</el-button>
<el-button type="primary" icon="el-icon-download" plain size="small" @click="exportExcel()">导出</el-button>
=======
<span>备料时间段:</span>
<el-date-picker
v-model="dateRange"
@@ -39,7 +35,6 @@
end-placeholder="结束日期"/>
<el-button icon="el-icon-search" type="success" size="small" @click="pageCurrent = 1;pageSize = 100;getTableData()">查询</el-button>
<el-button type="primary" icon="el-icon-download" size="small" @click="exportExcel()">导出</el-button>
>>>>>>> 6d4033c92a46c968832636b84ef2c64c7b192fe4
</div>
</el-card>
<el-card style="width: 76%">