Merge pull request 'projects/mesxc-zhp' (#249) from projects/mesxc-zhp into projects/mesxc-test

Reviewed-on: #249
This commit is contained in:
朱菊兰 2024-03-15 13:46:38 +08:00
commit b5049b22fa

View File

@ -1,7 +1,7 @@
<!-- <!--
* @Author: zhp * @Author: zhp
* @Date: 2023-12-12 13:45:25 * @Date: 2023-12-12 13:45:25
* @LastEditTime: 2024-03-14 13:46:39 * @LastEditTime: 2024-03-15 13:42:59
* @LastEditors: zhp * @LastEditors: zhp
* @Description: * @Description:
--> -->
@ -39,13 +39,13 @@
</el-table-column> </el-table-column>
<el-table-column label="规格" align="center"> <el-table-column label="规格" align="center">
<el-table-column label="成品" align="center"> <el-table-column label="成品" align="center">
<el-table-column :show-header="false"> <!-- <el-table-column :show-header="false"> -->
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-if="!disabled" v-model="scope.row.productionL" :disabled="disabled"></el-input> <el-input v-if="!disabled" v-model="scope.row.productionGlassSize" :disabled="disabled"></el-input>
<span v-else>{{ scope.row.productionL }} </span> <span v-else>{{ scope.row.productionGlassSize }} </span>
</template> </template>
</el-table-column> <!-- </el-table-column> -->
<el-table-column :show-header="false"> <!-- <el-table-column :show-header="false">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-if="!disabled" v-model="scope.row.productionW" :disabled="disabled"></el-input> <el-input v-if="!disabled" v-model="scope.row.productionW" :disabled="disabled"></el-input>
<span v-else>{{ scope.row.productionW }} </span> <span v-else>{{ scope.row.productionW }} </span>
@ -56,16 +56,16 @@
<el-input v-if="!disabled" v-model="scope.row.productionH" :disabled="disabled"></el-input> <el-input v-if="!disabled" v-model="scope.row.productionH" :disabled="disabled"></el-input>
<span v-else>{{ scope.row.productionH }} </span> <span v-else>{{ scope.row.productionH }} </span>
</template> </template>
</el-table-column> </el-table-column> -->
</el-table-column> </el-table-column>
<el-table-column label="原片" align="center"> <el-table-column prop="originalGlassSize" label="原片" align="center">
<el-table-column prop="originalGlassSize"> <!-- <el-table-column prop="originalGlassSize"> -->
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-if="!disabled" v-model="scope.row.originalGlassSize" :disabled="disabled"> <el-input v-if="!disabled" v-model="scope.row.originalGlassSize" :disabled="disabled">
</el-input> </el-input>
<span v-else>{{ scope.row.originalGlassSize }} </span> <span v-else>{{ scope.row.originalGlassSize }} </span>
</template> </template>
</el-table-column> <!-- </el-table-column> -->
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>