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

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

Browse Source
This commit is contained in:
bryan sun
2019-11-09 17:54:11 +08:00
parent 105cce9a94 92dc88f825
commit 47c156868d
1 changed files with 8 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/views/PurchasingCenter/OfflineContract/index.vue
View File

@@ -101,7 +101,7 @@
{{ scope.row.零件数量 }}
</template>
</el-table-column>
<el-table-column label="库存(BZ)" align="center" min-width="50" prop="库存">
<el-table-column label="库存(BZ)" align="center" min-width="70" prop="库存">
<template slot-scope="scope">
{{ Number(scope.row.零件类型) === 1 ? scope.row.库存 = Number(scope.row.货位存量 ? scope.row.货位存量 : 0) - Number(scope.row.占用数量) : '-' }}
</template>
@@ -164,21 +164,8 @@
</div>
</el-tab-pane>
<el-tab-pane label="仓库" name="仓库">
<el-row style="margin-bottom: 10px">
<el-row>
<el-input v-model="materialName" style="width: 150px;margin-left: 10px" placeholder="名称规格型号" size="small" clearable @keyup.enter.native="pageCurrent11=1;pageSize11=20;total11=0;searchTable22()"/>
<!--<span>物料状态:</span>-->
<!--<el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" size="small" style="width: 120px;margin: 0px"/>-->
<!--<el-date-picker-->
<!--v-model="startTime"-->
<!--size="small"-->
<!--type="daterange"-->
<!--align="center"-->
<!--value-format="yyyy-MM-dd"-->
<!--format="yyyy-MM-dd"-->
<!--range-separator="～"-->
<!--style="width:250px;margin-left: 10px"-->
<!--start-placeholder="开始日期"-->
<!--end-placeholder="结束日期"/>-->
<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="searchTable22()">查询</el-button>
</el-row>
<el-table
@@ -229,41 +216,21 @@
<el-card>
<div slot="header">
<!-- <span>离线合同号:</span>-->
<el-input v-model="offlineContract" placeholder="离线合同号" size="small" style="width: 140px" clearable/>
<!-- <span>供应商:</span>-->
<el-input v-model="supplierName0" placeholder="供应商" size="small" style="width: 140px" clearable/>
<el-button
type="success"
size="small"
icon="el-icon-search"
style="margin-left: 10px"
@click="pageCurrent2=1;pageSize2=10000;total2=0;searchTable2()">查询</el-button>
<el-button
type="primary"
size="small"
style="margin-left: 10px"
@click="addOfflineContract">创建离线合同</el-button>
<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="pageCurrent2=1;pageSize2=10000;total2=0;searchTable2()">查询</el-button>
<el-tooltip :open-delay="1000" effect="dark" content="将勾选的物料库中物料选入到选中的离线合同" placement="top">
<el-button
type="warning"
size="small"
style="margin-left: 10px"
@click="addMateriel">选入物料</el-button>
<el-button type="warning" size="small" style="margin-left: 10px" @click="addMateriel">选入物料</el-button>
</el-tooltip>
<el-button type="primary" size="small" style="margin-left: 50px" @click="addOfflineContract">创建离线合同</el-button>
<el-tooltip :open-delay="1000" effect="dark" content="生成合同" placement="top">
<el-button :disabled="disable" type="success" size="mini" style="float:right;margin-left:10px" @click="doneOfflineContact">生成</el-button>
</el-tooltip>
<el-button :disabled="disable" type="info" size="mini" style="float:right" @click="saveContract">保存</el-button>
<el-tooltip :content="hasTax" placement="top">
<el-switch
v-model="hasTax"
active-color="#13ce66"
inactive-color="#ff4949"
active-value="含税"
inactive-value="未税"
style="margin: 3px;float:right"/>
<el-switch v-model="hasTax" active-color="#13ce66" inactive-color="#ff4949" active-value="含税" inactive-value="未税" style="margin: 3px;float:right"/>
</el-tooltip>
<el-input v-model="taxRate" style="float:right;width:100px" placeholder="税率" size="mini"/>
<h4 style="float:right;width: 40px;margin: 5px">税率:</h4>