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:
liulujia
2020-04-29 17:28:39 +08:00
parent 0b6bfc1655 63bd20eb48
commit c45e4760ec
31 changed files with 350 additions and 431 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue
View File

@@ -16,7 +16,7 @@
:value="item.value"/>
</el-select>
<el-button size="small" type="primary" icon="el-icon-search" style="margin: 0 0 0 10px" plain @click="searchTable()">查询</el-button>
<el-button size="small" type="primary" icon="el-icon-download" style="margin: 0 0 0 10px" plain @click="exportExcel()">导出</el-button>
<el-button v-positive="'loading'" :disabled="false" size="small" type="primary" icon="el-icon-download" style="margin: 0 0 0 10px" plain @click="exportExcel()">导出</el-button>
</el-card>
<el-card>
<el-table v-loading="loading" :data="tableData" highlight-current-row show-summary border style="width: 1510px;" size="mini" height="700">

2
src/views/ManufacturingCenter/ContractDetailsInquiryMetalworking/index.vue
View File

@@ -16,7 +16,7 @@
:value="item.value"/>
</el-select>
<el-button size="small" type="primary" icon="el-icon-search" style="margin: 0 0 0 10px" plain @click="searchTable()">查询</el-button>
<el-button size="small" type="primary" icon="el-icon-download" style="margin: 0 0 0 10px" plain @click="exportExcel()">导出</el-button>
<el-button v-positive="'loading'" :disabled="false" size="small" type="primary" icon="el-icon-download" style="margin: 0 0 0 10px" plain @click="exportExcel()">导出</el-button>
</el-card>
<el-card>
<el-table v-loading="loading" :data="tableData" :summary-method="getSummaries" show-summary highlight-current-row border style="width: 1360px;" size="mini" height="590">

2
src/views/ManufacturingCenter/DiscardedPartsInquiry/index.vue
View File

@@ -38,7 +38,7 @@
start-placeholder="开始日期"
end-placeholder="结束日期"/>
<el-button type="primary" icon="el-icon-search" size="small" plain style="margin-left: 10px" @click="total=0;pageSize = 20;pageCurrent = 1;searchData1()">查询</el-button>
<el-button type="success" icon="el-icon-download" size="small" plain style="margin-left: 10px" @click="exportExcel()">导出</el-button>
<el-button v-positive="'loading'" :disabled="false" type="success" icon="el-icon-download" size="small" plain style="margin-left: 10px" @click="exportExcel()">导出</el-button>
</el-row>
</el-card>
<el-row>

2
src/views/ManufacturingCenter/InventoryQuery/index.vue
View File

@@ -5,7 +5,7 @@
<el-row style="margin-bottom:-10px!important;">
<el-input v-model="materialName" placeholder="名称规格型号" size="small" clearable style="margin-bottom: 10px; width: 180px;"/>
<el-button type="primary" icon="el-icon-search" size="small" plain style="margin-left: 20px" @click="pageCurrent=1;pageSize=30;searchMaterial()">查询</el-button>
<el-button type="success" icon="el-icon-bottom" plain size="small" @click="exportExcel()">导出</el-button>
<el-button v-positive="'loading'" :disabled="false" type="success" icon="el-icon-bottom" plain size="small" @click="exportExcel()">导出</el-button>
</el-row>
</div>
<el-table :data="tableData1" stripe highlight-current-row border height="600px" style="width: 579px" size="mini">

2
src/views/ManufacturingCenter/MaterialArrival/index.vue
View File

@@ -22,7 +22,7 @@
</el-select>
<el-input v-model="Partpaint" placeholder="零件号" clearable size="small" style="width: 180px;margin:0px 10px;"/>
<el-button type="primary" plain class="el-icon-search" size="small" style="margin: 0px 10px;" @click="pageCurrent = 1;pageSize = 50;getTableData()">查询</el-button>
<el-button :disabled="Name===1" type="success" plain class="el-icon-finished" size="small" style="margin-left: 220px" @click="submit">完成</el-button>
<el-button v-positive="'loading'" :disabled="Name===1" type="success" plain class="el-icon-finished" size="small" style="margin-left: 220px" @click="submit">完成</el-button>
</el-card>
<el-row>
<el-card style="width: 870px; margin-left: 0px;display: inline-block;" >

2
src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue
View File

@@ -18,7 +18,7 @@
<el-checkbox v-model="check" class="remeberPassword">筛选</el-checkbox>
</el-tooltip>
<el-button size="small" type="primary" icon="el-icon-search" style="margin-left: 5px" plain @click="pageCurrent=1;pageSize=50;searchTable()">查询</el-button>
<el-button size="small" type="success" icon="el-icon-download" plain @click="exportExcel">导出</el-button>
<el-button v-positive="'loading'" :disabled="false" size="small" type="success" icon="el-icon-download" plain @click="exportExcel">导出</el-button>
</el-card>
<el-card>
<el-table v-loading="loading" :data="tableData" size="mini" style="max-height: 720px" height="720px" border @sort-change="sortChange">

2
src/views/ManufacturingCenter/MonthEndHourAccountingMetalworking/index.vue
View File

@@ -18,7 +18,7 @@
<el-checkbox v-model="check" class="remeberPassword">筛选</el-checkbox>
</el-tooltip>
<el-button size="small" type="primary" icon="el-icon-search" style="margin-left: 5px" plain @click="pageCurrent=1;pageSize=50;searchTable()">查询</el-button>
<el-button size="small" type="success" icon="el-icon-download" plain @click="exportExcel">导出</el-button>
<el-button v-positive="'loading'" :disabled="false" size="small" type="success" icon="el-icon-download" plain @click="exportExcel">导出</el-button>
</el-card>
<el-card>
<el-table v-loading="loading" :data="tableData" :summary-method="getSummaries" show-summary size="mini" style="max-height: 590px;width: 1370px" height="720px" border @sort-change="sortChange">

4
src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue
View File

@@ -19,8 +19,8 @@
:value="item.value"/>
</el-select>
<el-button type="primary" size="small" icon="el-icon-bangzhu" style="margin-left: 10px" plain @click="selectAll(tableData)">全选</el-button>
<el-button :loading="loading" type="success" size="small" icon="el-icon-upload" style="margin-left: 10px" plain @click="save">保存</el-button>
<el-button :loading="loading" type="success" size="small" icon="el-icon-upload" style="margin-left: 300px" plain @click="currency">通用件保存</el-button>
<el-button v-positive="'loading'" :disabled="false" type="success" size="small" icon="el-icon-upload" style="margin-left: 10px" plain @click="save">保存</el-button>
<el-button v-positive="'loading'" :disabled="false" type="success" size="small" icon="el-icon-upload" style="margin-left: 300px" plain @click="currency">通用件保存</el-button>
</el-card>
<el-card>
<el-table ref="multipleTable" :data="tableData" :row-class-name="tableRowClassName1" style="width: 1000px;" size="mini" height="750" highlight-current-row border @selection-change="handleSelectionChange" @row-click="rowClick">

2
src/views/ManufacturingCenter/ProcessingStatusNew/index.vue
View File

@@ -21,7 +21,7 @@
</el-select>
<el-input v-model="number" placeholder="零件号" clearable size="small" style="width: 170px;margin:0px 10px;"/>
<el-button type="primary" class="el-icon-search" size="small" plain style="margin: 0px 10px;" @click="pageCurrent = 1;pageSize = 100;getTableData()">查询</el-button>
<el-button type="warning" class="el-icon-download" size="small" plain style="margin: 10px 0 0 10px" @click="exportExcel">导出</el-button>
<el-button v-positive="'loading'" :disabled="false" type="warning" class="el-icon-download" size="small" plain style="margin: 10px 0 0 10px" @click="exportExcel">导出</el-button>
<!--<el-button :disabled="isDisabled" type="info" size="small" style="margin: 10px 10px;float: right" @click="EditConfirmNum">修改完成数量</el-button>-->
<!--<el-button :disabled="isDisabled" type="info" size="small" style="margin: 10px 10px;float: right" @click="EditWorkingHours">修补加工工时</el-button>-->
</el-card>

2
src/views/ManufacturingCenter/ProductionPlanQuery/index.vue
View File

@@ -26,7 +26,7 @@
<el-tooltip :open-delay="1200" effect="dark" content="只查询加急的零件" placement="top">
<el-checkbox v-model="all" size="small">加急</el-checkbox>
</el-tooltip>
<el-button type="success" icon="el-icon-download" size="small" plain style="margin-left: 10px" @click="exportTable()">导出</el-button>
<el-button v-positive="'loading'" :disabled="false" type="success" icon="el-icon-download" size="small" plain style="margin-left: 10px" @click="exportTable()">导出</el-button>
</el-row>
</el-card>
</div>

6
src/views/ManufacturingCenter/maintainInformation/index.vue
View File

@@ -13,7 +13,7 @@
</el-select>
<span>选择月份：</span>
<el-date-picker v-model="monthssss" size="small" type="month" value-format="yyyy-MM" format="yyyy-MM" style="width: 120px" placeholder="选择月"/>
<el-button size="small" type="warning" style="margin-right: 50px" plain @click="exportOut()">导出日点检表</el-button>
<el-button v-positive="'loading'" :disabled="false" size="small" type="warning" style="margin-right: 50px" plain @click="exportOut()">导出日点检表</el-button>
</div>
</div>
<el-table v-loading="loading1" :data="tableData1" stripe height="200" border>
@@ -391,7 +391,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="callOff1('form1')">取消</el-button>
<el-button type="primary" @click="submit1('form1')" >确定</el-button>
<el-button v-positive="'loading'" :disabled="false" type="primary" @click="submit1('form1')" >确定</el-button>
</div>
</el-dialog>
<el-dialog :visible.sync="dialogFormVisible2" title="新增" center width="500px">
@@ -411,7 +411,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="callOff2('form2')">取消</el-button>
<el-button type="primary" @click="submit2('form2')" >确定</el-button>
<el-button v-positive="'loading'" :disabled="false" type="primary" @click="submit2('form2')" >确定</el-button>
</div>
</el-dialog>
</div>