Skip to content

T
TF-MOM-WEB
Commit 2044cd35 authored by jingnan's avatar jingnan 👀
Browse files
Options

废品通知单修改

parent 03d00146
Hide whitespace changes
Inline Side-by-side
Showing with 41 additions and 34 deletions
applications/dee-mes/src/privateComponents/components/ScrapNoticeDocReceipt/threeTable.vue
View file @ 2044cd35
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
</td> </td>
<td class="input"> <td class="input">
<el-form-item prop="quota"> <el-form-item prop="quota">
<el-input v-model="form.quota" clearable type="Number" min="0" placeholder="请输入" /> <el-input v-model="form.quota" :disabled="basicData.isOnlyRead" clearable type="Number" min="0" placeholder="请输入" />
<!-- :disabled="costEstimator || (disabled && !costEstimator)" --> <!-- :disabled="costEstimator || (disabled && !costEstimator)" -->
</el-form-item> </el-form-item>
</td> </td>
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
</td> </td>
<td class="input"> <td class="input">
<el-form-item prop="consumeCount"> <el-form-item prop="consumeCount">
<el-input v-model="form.consumeCount" clearable type="Number" min="0" placeholder="请输入" /> <el-input v-model="form.consumeCount" :disabled="basicData.isOnlyRead" clearable type="Number" min="0" placeholder="请输入" />
<!-- :disabled="costEstimator || (disabled && !costEstimator)" --> <!-- :disabled="costEstimator || (disabled && !costEstimator)" -->
</el-form-item> </el-form-item>
</td> </td>
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
</td> </td>
<td class="input"> <td class="input">
<el-form-item prop="price"> <el-form-item prop="price">
<el-input v-model="form.price" clearable type="Number" min="0" placeholder="请输入" /> <el-input v-model="form.price" :disabled="basicData.isOnlyRead" clearable type="Number" min="0" placeholder="请输入" />
<!-- :disabled="costEstimator || (disabled && !costEstimator)" --> <!-- :disabled="costEstimator || (disabled && !costEstimator)" -->
</el-form-item> </el-form-item>
</td> </td>
...@@ -125,7 +125,7 @@ ...@@ -125,7 +125,7 @@
</td> </td>
<td class="input"> <td class="input">
<el-form-item prop="subMaterialLossValue"> <el-form-item prop="subMaterialLossValue">
<el-input v-model="form.subMaterialLossValue" clearable placeholder="请输入" type="Number" min="0" /> <el-input v-model="form.subMaterialLossValue" :disabled="basicData.isOnlyRead" clearable placeholder="请输入" type="Number" min="0" />
<!-- :disabled="costEstimator || (disabled && !costEstimator)" --> <!-- :disabled="costEstimator || (disabled && !costEstimator)" -->
</el-form-item> </el-form-item>
</td> </td>
...@@ -136,7 +136,7 @@ ...@@ -136,7 +136,7 @@
</td> </td>
<td class="input"> <td class="input">
<el-form-item prop="totalLossValue"> <el-form-item prop="totalLossValue">
<el-input v-model="form.totalLossValue" clearable type="Number" min="0" placeholder="请输入" /> <el-input v-model="form.totalLossValue" :disabled="basicData.isOnlyRead" clearable type="Number" min="0" placeholder="请输入" />
<!-- :disabled="costEstimator || (disabled && !costEstimator)" --> <!-- :disabled="costEstimator || (disabled && !costEstimator)" -->
</el-form-item> </el-form-item>
</td> </td>
...@@ -151,7 +151,7 @@ ...@@ -151,7 +151,7 @@
v-model="form.disassemblyDate" v-model="form.disassemblyDate"
clearable clearable
type="Number" type="Number"
:disabled="technologist || (disabled && !technologist)" :disabled="technologist || (disabled && !technologist)||basicData.isOnlyRead"
min="0" min="0"
placeholder="请输入" placeholder="请输入"
/> />
...@@ -164,14 +164,14 @@ ...@@ -164,14 +164,14 @@
<el-form-item prop="clsign"> <el-form-item prop="clsign">
<label for="">材料定额员：</label> <label for="">材料定额员：</label>
<el-input v-model="form.clsign" clearable :disabled="Activity_1dnbmb6" class="material-quota-officer" /> <el-input v-model="form.clsign" clearable :disabled="Activity_1dnbmb6||basicData.isOnlyRead" class="material-quota-officer" />
<!-- <span class="material-quota-officer" contenteditable="true" /> --> <!-- <span class="material-quota-officer" contenteditable="true" /> -->
</el-form-item> </el-form-item>
</div> </div>
<div> <div>
<el-form-item prop="gysign"> <el-form-item prop="gysign">
<label for="">工艺员：</label> <label for="">工艺员：</label>
<el-input v-model="form.gysign" clearable :disabled="Activity_1dnbmb6" class="technologists" /> <el-input v-model="form.gysign" clearable :disabled="Activity_1dnbmb6||basicData.isOnlyRead" class="technologists" />
<!-- <span class="technologist" contenteditable="true" /> --> <!-- <span class="technologist" contenteditable="true" /> -->
</el-form-item> </el-form-item>
</div> </div>
...@@ -180,7 +180,7 @@ ...@@ -180,7 +180,7 @@
</tbody> </tbody>
</table> </table>
</el-form> </el-form>
<div class="table-btn"> <div v-if="!basicData.isOnlyRead" class="table-btn">
<el-button type="primary" size="small" :disabled="disab" @click="save">确定</el-button> <el-button type="primary" size="small" :disabled="disab" @click="save">确定</el-button>
<el-button size="small" :disabled="disab" @click="handleClose">取消</el-button> <el-button size="small" :disabled="disab" @click="handleClose">取消</el-button>
</div> </div>
......
applications/dee-mes/src/privateComponents/components/ScrapNoticeDocReceipt/twoTable.vue
View file @ 2044cd35
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
<el-input <el-input
v-model="form.materialCount" v-model="form.materialCount"
clearable clearable
:disabled="costEstimator || (disabled && !costEstimator)" :disabled="costEstimator || (disabled && !costEstimator)||basicData.isOnlyRead"
min="0" min="0"
type="Number" type="Number"
placeholder="请输入" placeholder="请输入"
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
<el-input <el-input
v-model="form.materialCost" v-model="form.materialCost"
clearable clearable
:disabled="costEstimator || (disabled && !costEstimator)" :disabled="costEstimator || (disabled && !costEstimator)||basicData.isOnlyRead"
min="0" min="0"
type="Number" type="Number"
placeholder="请输入" placeholder="请输入"
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
<el-input <el-input
v-model="form.curOpCostPCount" v-model="form.curOpCostPCount"
clearable clearable
:disabled="costEstimator || (disabled && !costEstimator)" :disabled="costEstimator || (disabled && !costEstimator)||basicData.isOnlyRead"
min="0" min="0"
type="Number" type="Number"
placeholder="请输入" placeholder="请输入"
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
<el-input <el-input
v-model="form.curOpCostP" v-model="form.curOpCostP"
clearable clearable
:disabled="costEstimator || (disabled && !costEstimator)" :disabled="costEstimator || (disabled && !costEstimator)||basicData.isOnlyRead"
min="0" min="0"
type="Number" type="Number"
placeholder="请输入" placeholder="请输入"
...@@ -98,7 +98,7 @@ ...@@ -98,7 +98,7 @@
<el-input <el-input
v-model="form.curOpCostMCount" v-model="form.curOpCostMCount"
clearable clearable
:disabled="costEstimator || (disabled && !costEstimator)" :disabled="costEstimator || (disabled && !costEstimator)||basicData.isOnlyRead"
min="0" min="0"
type="Number" type="Number"
placeholder="请输入" placeholder="请输入"
...@@ -111,7 +111,7 @@ ...@@ -111,7 +111,7 @@
<el-input <el-input
v-model="form.curOpCostM" v-model="form.curOpCostM"
clearable clearable
:disabled="costEstimator || (disabled && !costEstimator)" :disabled="costEstimator || (disabled && !costEstimator)||basicData.isOnlyRead"
min="0" min="0"
type="Number" type="Number"
placeholder="请输入" placeholder="请输入"
...@@ -139,7 +139,7 @@ ...@@ -139,7 +139,7 @@
<el-input <el-input
v-model="form.perOpCostPCount" v-model="form.perOpCostPCount"
clearable clearable
:disabled="costEstimator || (disabled && !costEstimator)" :disabled="costEstimator || (disabled && !costEstimator)||basicData.isOnlyRead"
min="0" min="0"
type="Number" type="Number"
placeholder="请输入" placeholder="请输入"
...@@ -152,7 +152,7 @@ ...@@ -152,7 +152,7 @@
<el-input <el-input
v-model="form.perOpCostP" v-model="form.perOpCostP"
clearable clearable
:disabled="costEstimator || (disabled && !costEstimator)" :disabled="costEstimator || (disabled && !costEstimator)||basicData.isOnlyRead"
min="0" min="0"
type="Number" type="Number"
placeholder="请输入" placeholder="请输入"
...@@ -172,7 +172,7 @@ ...@@ -172,7 +172,7 @@
<el-input <el-input
v-model="form.perOpCostMCount" v-model="form.perOpCostMCount"
clearable clearable
:disabled="costEstimator || (disabled && !costEstimator)" :disabled="costEstimator || (disabled && !costEstimator)||basicData.isOnlyRead"
min="0" min="0"
type="Number" type="Number"
placeholder="请输入" placeholder="请输入"
...@@ -185,7 +185,7 @@ ...@@ -185,7 +185,7 @@
<el-input <el-input
v-model="form.perOpCostM" v-model="form.perOpCostM"
clearable clearable
:disabled="costEstimator || (disabled && !costEstimator)" :disabled="costEstimator || (disabled && !costEstimator)||basicData.isOnlyRead"
min="0" min="0"
type="Number" type="Number"
placeholder="请输入" placeholder="请输入"
...@@ -217,6 +217,7 @@ ...@@ -217,6 +217,7 @@
min="0" min="0"
type="Number" type="Number"
placeholder="请输入" placeholder="请输入"
:disabled="basicData.isOnlyRead"
@input="outCount" @input="outCount"
/> />
</el-form-item> </el-form-item>
...@@ -229,6 +230,7 @@ ...@@ -229,6 +230,7 @@
min="0" min="0"
type="Number" type="Number"
placeholder="请输入" placeholder="请输入"
:disabled="basicData.isOnlyRead"
@input="outPrice" @input="outPrice"
/> />
</el-form-item> </el-form-item>
...@@ -249,6 +251,7 @@ ...@@ -249,6 +251,7 @@
min="0" min="0"
type="Number" type="Number"
placeholder="请输入" placeholder="请输入"
:disabled="basicData.isOnlyRead"
@input="outCount" @input="outCount"
/> />
</el-form-item> </el-form-item>
...@@ -260,6 +263,7 @@ ...@@ -260,6 +263,7 @@
clearable clearable
min="0" min="0"
type="Number" type="Number"
:disabled="basicData.isOnlyRead"
placeholder="请输入" placeholder="请输入"
@input="outPrice" @input="outPrice"
/> />
...@@ -279,6 +283,7 @@ ...@@ -279,6 +283,7 @@
clearable clearable
min="0" min="0"
type="Number" type="Number"
:disabled="basicData.isOnlyRead"
placeholder="请输入" placeholder="请输入"
@input="outCount" @input="outCount"
/> />
...@@ -291,6 +296,7 @@ ...@@ -291,6 +296,7 @@
clearable clearable
min="0" min="0"
type="Number" type="Number"
:disabled="basicData.isOnlyRead"
placeholder="请输入" placeholder="请输入"
@input="outPrice" @input="outPrice"
/> />
...@@ -326,7 +332,7 @@ ...@@ -326,7 +332,7 @@
<el-input <el-input
v-model="form.scrapValue" v-model="form.scrapValue"
clearable clearable
:disabled="costEstimator || (disabled && !costEstimator)" :disabled="costEstimator || (disabled && !costEstimator)||basicData.isOnlyRead"
min="0" min="0"
type="Number" type="Number"
placeholder="请输入" placeholder="请输入"
...@@ -350,7 +356,7 @@ ...@@ -350,7 +356,7 @@
<el-input <el-input
v-model="form.netLoss" v-model="form.netLoss"
clearable clearable
:disabled="costEstimator || (disabled && !costEstimator)" :disabled="costEstimator || (disabled && !costEstimator)||basicData.isOnlyRead"
min="0" min="0"
type="Number" type="Number"
placeholder="请输入" placeholder="请输入"
...@@ -369,28 +375,28 @@ ...@@ -369,28 +375,28 @@
<td colspan="2"> <td colspan="2">
<p>合计：{{ form.materialF }}</p> <p>合计：{{ form.materialF }}</p>
<p class="input"> <p class="input">
签字：<el-input clearable placeholder="请输入名字" /> 签字：<el-input :disabled="basicData.isOnlyRead" clearable placeholder="请输入名字" />
</p> </p>
<p class="input"> <p class="input">
日期：<el-input clearable placeholder="请输入日期" /> 日期：<el-input :disabled="basicData.isOnlyRead" clearable placeholder="请输入日期" />
</p> </p>
</td> </td>
<td colspan="2"> <td colspan="2">
<p>合计：{{ form.workHourF }}</p> <p>合计：{{ form.workHourF }}</p>
<p class="input"> <p class="input">
签字：<el-input clearable placeholder="请输入名字" /> 签字：<el-input :disabled="basicData.isOnlyRead" clearable placeholder="请输入名字" />
</p> </p>
<p class="input"> <p class="input">
日期：<el-input clearable placeholder="请输入日期" /> 日期：<el-input :disabled="basicData.isOnlyRead" clearable placeholder="请输入日期" />
</p> </p>
</td> </td>
<td> <td>
<p>合计：{{ form.manufactureF }}</p> <p>合计：{{ form.manufactureF }}</p>
<p class="input"> <p class="input">
签字：<el-input clearable placeholder="请输入名字" /> 签字：<el-input :disabled="basicData.isOnlyRead" clearable placeholder="请输入名字" />
</p> </p>
<p class="input"> <p class="input">
日期：<el-input clearable placeholder="请输入日期" /> 日期：<el-input :disabled="basicData.isOnlyRead" clearable placeholder="请输入日期" />
</p> </p>
</td> </td>
<td> <td>
...@@ -411,16 +417,16 @@ ...@@ -411,16 +417,16 @@
</p> </p>
</el-form-item> </el-form-item>
<p class="input"> <p class="input">
签字：<el-input clearable placeholder="请输入名字" /> 签字：<el-input :disabled="basicData.isOnlyRead" clearable placeholder="请输入名字" />
</p> </p>
<p class="input"> <p class="input">
日期：<el-input clearable placeholder="请输入日期" /> 日期：<el-input :disabled="basicData.isOnlyRead" clearable placeholder="请输入日期" />
</p> </p>
</td> </td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
<div class="table-btn"> <div v-if="!basicData.isOnlyRead" class="table-btn">
<el-button type="primary" size="small" :disabled="disab" @click="save">确定</el-button> <el-button type="primary" size="small" :disabled="disab" @click="save">确定</el-button>
<el-button size="small" :disabled="disab" @click="handleClose">取消</el-button> <el-button size="small" :disabled="disab" @click="handleClose">取消</el-button>
</div> </div>
...@@ -546,9 +552,9 @@ export default { ...@@ -546,9 +552,9 @@ export default {
} else if (!that.workHourMCount || !that.workHourMCost) { } else if (!that.workHourMCount || !that.workHourMCost) {
that.workHourMLossCost = 0 that.workHourMLossCost = 0
} }
if (that.curTotalLossCost) { if (that.totalLossCost) {
that.accounts = parseFloat(that.curTotalLossCost) that.accounts = parseFloat(that.totalLossCost)
} else if (!that.curTotalLossCost) { } else if (!that.totalLossCost) {
that.accounts = 0 that.accounts = 0
} }
this.outLoss() this.outLoss()
...@@ -639,7 +645,8 @@ export default { ...@@ -639,7 +645,8 @@ export default {
const params = { const params = {
id: this.item.id, id: this.item.id,
operator: 'MODIFY', // 增加操作 operator: 'MODIFY', // 增加操作
...this.form ...this.form,
loss: this.form.accounts
} }
this.$api.recursion('ScrapNoticeDoc', params).then((res) => { this.$api.recursion('ScrapNoticeDoc', params).then((res) => {
this.item = res.items this.item = res.items
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment