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

冲突MANUFACUR/CREAWAREHOUPURCH

Browse Source
This commit is contained in:
zhangdingyu
2019-10-18 14:16:31 +08:00
parent 81a50773a5
commit a52f199c87
1 changed files with 0 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/views/ManufacturingCenter/CreateWarehousePurchasing/index.vue
View File

@@ -19,17 +19,6 @@
:label="item.label"
:value="item.value"/>
</el-select>
<<<<<<< HEAD
=======
<span>采购状态:</span>
<el-select v-model="purchaseStateValue" placeholder="采购状态" size="small">
<el-option
v-for="item in purchaseState"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
>>>>>>> 1989b23ce9441b6cb0f51500157bd7419f830ebe
<el-button
type="success"
size="small"
@@ -88,16 +77,11 @@
<template slot-scope="scope">
<template v-if="scope.row.changeSafeValue">
<el-input v-model="scope.row.安全库存量" class="edit-input" size="mini"/>
<<<<<<< HEAD
<el-button class="cancel-btn" size="mini" icon="el-icon-refresh" type="warning" @click="cancelEdit1(scope.row)">取消</el-button>
=======
<el-button class="cancel-btn" size="mini" icon="el-icon-refresh" type="warning" @click="cancelEdit(scope.row)">取消</el-button>
>>>>>>> 1989b23ce9441b6cb0f51500157bd7419f830ebe
</template>
<span v-else>{{ scope.row.安全库存量 }}</span>
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column label="设置" min-width="70" align="center">
<template slot-scope="scope">
<el-tooltip :open-delay="1000" effect="dark" content="设置安全库存量" placement="top">
@@ -112,8 +96,6 @@
</el-tooltip>
</template>
</el-table-column>
=======
>>>>>>> 1989b23ce9441b6cb0f51500157bd7419f830ebe
</el-table>
<div class="block" style="margin-top: 10px;">
<el-pagination
@@ -132,11 +114,7 @@
<el-card>
<div slot="header">
<span>采购明细表名称:</span>
<<<<<<< HEAD
<el-input v-model="purchasingDetailsForm" placeholder="采购明细表名称" size="small" clearable/>
=======
<el-input v-model="purchasingDetailsForm" placeholder="采购明细表号" size="small" clearable/>
>>>>>>> 1989b23ce9441b6cb0f51500157bd7419f830ebe
<el-button
type="success"
size="small"
@@ -158,15 +136,12 @@
</div>
<!-- -->
<el-table v-loading="loading1" :data="tableData1" border style="max-height: 460px;" height="300px" size="mini" highlight-current-row @row-click="searchTable2">
<<<<<<< HEAD
<el-table-column label="分配状态" align="center" min-width="170">
<template slot-scope="scope">
<el-tag v-if="parseInt(scope.row.是否分配)===0" type="warning" size="small">未分配</el-tag>
<el-tag v-if="parseInt(scope.row.是否分配)===1" type="success" size="small">已分配</el-tag>
</template>
</el-table-column>
=======
>>>>>>> 1989b23ce9441b6cb0f51500157bd7419f830ebe
<el-table-column label="表单编号" align="center" min-width="170">
<template slot-scope="scope">
{{ scope.row.表单编号 }}
@@ -206,18 +181,11 @@
@current-change="handleCurrentChange1"/>
</div>
<h3>合同详细信息</h3>
<<<<<<< HEAD
<el-table v-loading="" :data="tableData2" border style="max-height: 500px;" height="450px" size="mini">
<el-table-column label="序号" type="index" align="center" width="110"/>
<el-table-column label="表单编号" align="center" width="110">
<template slot-scope="scope">
{{ scope.row.表单编号 }}
=======
<el-table v-loading="" :data="tableData3" :summary-method="getSummaries" border style="max-height: 500px;" height="450px" size="mini" show-summary>
<el-table-column label="表单编号" align="center" width="110">
<template slot-scope="scope">
{{ scope.row.离线合同编号 }}
>>>>>>> 1989b23ce9441b6cb0f51500157bd7419f830ebe
</template>
</el-table-column>
<el-table-column label="物料名称" align="center" min-width="150">
@@ -237,37 +205,17 @@
</el-table-column>
<el-table-column label="数量" align="center" min-width="100">
<template slot-scope="scope">
<<<<<<< HEAD
<el-input v-model="scope.row.数量" size="mini" style="width:70px" @change="updateNumber(scope.row)"/>
=======
<el-input v-direction="{x: 0, y: scope.$index}" v-if="quickChangePrice" v-model="scope.row.数量" :disabled="disable" size="mini" style="width:70px"/>
<b v-else>{{ scope.row.数量 }}</b>
</template>
</el-table-column>
<el-table-column label="单位" align="center" min-width="60">
<template slot-scope="scope">
{{ scope.row.计量单位 }}
>>>>>>> 1989b23ce9441b6cb0f51500157bd7419f830ebe
</template>
</el-table-column>
<el-table-column label="备注" align="center" min-width="150" prop="备注">
<template slot-scope="scope">
<<<<<<< HEAD
<el-input v-model="scope.row.备注" size="mini" style="width:120px" @change="updateNumber(scope.row)"/>
=======
<el-input v-direction="{x: 3, y: scope.$index}" v-if="quickChangePrice" v-model="scope.row.备注" :disabled="disable" size="mini" style="width:120px"/>
<b v-else>{{ scope.row.备注 || '—' }}</b>
>>>>>>> 1989b23ce9441b6cb0f51500157bd7419f830ebe
</template>
</el-table-column>
<el-table-column label="操作" align="center" min-width="100">
<template slot-scope="scope">
<<<<<<< HEAD
<el-button type="danger" plain size="mini" icon="el-icon-delete" @click="deleteMateriel(scope.row)">移除</el-button>
=======
<el-button v-if="quickChangePrice" :disabled="disable" type="danger" plain size="mini" icon="el-icon-delete" @click="deleteMateriel(scope.row)">移除</el-button>
<b v-else>移除</b>
>>>>>>> 1989b23ce9441b6cb0f51500157bd7419f830ebe
</template>
</el-table-column>
</el-table>
@@ -385,7 +333,6 @@ export default {
this.dialogVisible = false
}
})
<<<<<<< HEAD
},
cancelEdit1(row) { // 取消设置
row.安全库存量 = row.原安全库存量