zx il y a 1 an
Parent
commit
6543bc8324

+ 41 - 36
fhKeeper/formulahousekeeper/timesheet-workshop/src/views/product/list.vue

@@ -47,37 +47,38 @@
 
             <el-table-column type="expand">
                 <template slot-scope="props">
-                    <el-form label-position="left" inline class="demo-table-expand">
-                        <el-form-item label="派工单">
-                            <span>版本号:</span>
-                            <el-select v-model="props.row.tableProdProcedure.version" placeholder="请选择版本号"
-                                @change="changeProcedureVersion(props.row)">
-                                <el-option v-for="item in props.row.tableProdProcedure.versions" :key="item" :label="item"
-                                    :value="item">
-                                </el-option>
-                            </el-select>
-                        </el-form-item>
-                        <el-form-item>
-                            <el-table :data="props.row.tableProdProcedure.procedureList" border style="width: 100%">
-                                <el-table-column prop="name" label="工序名称" width="180">
-                                </el-table-column>
-                                <el-table-column prop="workingTime" label="单件工时" width="180">
-                                </el-table-column>
-                                <el-table-column prop="unitPrice" label="单件工价" width="180">
-                                </el-table-column>
-                                <el-table-column label="质检类型" width="180">
-                                    <template slot-scope="scope">
-                                        <span v-if="scope.row.checkType == 0">自检</span>
-                                        <span v-if="scope.row.checkType == 1">互检</span>
-                                        <span v-if="scope.row.checkType == 2">专检</span>
-                                    </template>
-                                    <!--   -->
-                                </el-table-column>
-                            </el-table>
-
-                        </el-form-item>
-
-                        <!--       <el-form-item label="物料单">
+                    <div style="max-height: 400px;overflow-y: auto; box-sizing: border-box;padding-left: 40px;">
+                         <el-form label-position="left" inline class="demo-table-expand">
+                            <el-form-item label="派工单">
+                                <span>版本号:</span>
+                                <el-select v-model="props.row.tableProdProcedure.version" placeholder="请选择版本号"
+                                    @change="changeProcedureVersion(props.row)">
+                                    <el-option v-for="item in props.row.tableProdProcedure.versions" :key="item" :label="item"
+                                        :value="item">
+                                    </el-option>
+                                </el-select>
+                            </el-form-item>
+                            <el-form-item>
+                                <el-table :data="props.row.tableProdProcedure.procedureList" border style="width: 100%">
+                                    <el-table-column prop="name" label="工序名称" width="180">
+                                    </el-table-column>
+                                    <el-table-column prop="workingTime" label="单件工时" width="180">
+                                    </el-table-column>
+                                    <el-table-column prop="unitPrice" label="单件工价" width="180">
+                                    </el-table-column>
+                                    <el-table-column label="质检类型" width="180">
+                                        <template slot-scope="scope">
+                                            <span v-if="scope.row.checkType == 0">自检</span>
+                                            <span v-if="scope.row.checkType == 1">互检</span>
+                                            <span v-if="scope.row.checkType == 2">专检</span>
+                                        </template>
+                                        <!--   -->
+                                    </el-table-column>
+                                </el-table>
+
+                            </el-form-item>
+
+                            <!--       <el-form-item label="物料单">
                             <span>版本号:</span>
                             <el-select v-model="prodMaterialVersion" placeholder="请选择版本号"
                                 @change="changeMaterialVersion(props.row)">
@@ -105,7 +106,8 @@
                             </el-table>
 
                         </el-form-item> -->
-                    </el-form>
+                        </el-form>
+                    </div>
                 </template>
             </el-table-column>
 
@@ -223,22 +225,22 @@
 
                 <el-input placeholder="请输入工序版本号" v-model="procedureVersion" clearable maxlength="50" class="input-pM"></el-input>
                 <el-table :data="procedureLit" style="width: 100%">
-                    <el-table-column prop="name" label="工序名称"  width="180">
+                    <el-table-column prop="name" label="工序名称"  width="350">
                         <template slot-scope="scope">
                             <el-input v-model="scope.row.name" clearable placeholder="请输入"  maxlength="30"></el-input>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="workingTime" label="单件工时(分)"  width="180">
+                    <el-table-column prop="workingTime" label="单件工时(分)"  width="140">
                         <template slot-scope="scope">
                             <el-input v-model="scope.row.workingTime"   clearable maxlength="11" placeholder="请输入"></el-input>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="unitPrice" label="单件工价(元)"  width="180">
+                    <el-table-column prop="unitPrice" label="单件工价(元)"  width="140">
                         <template slot-scope="scope">
                             <el-input v-model="scope.row.unitPrice"   clearable maxlength="9"  placeholder="请输入"></el-input>
                         </template>
                     </el-table-column>
-                    <el-table-column label="质检类型" width="180">
+                    <el-table-column label="质检类型" width="150">
                         <template slot-scope="scope">
                             <el-select v-model="scope.row.checkType" placeholder="请选择">
                                 <el-option v-for="item in checkTypeOptions" :key="item.value" :label="item.label"
@@ -3588,6 +3590,9 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+* {
+    box-sizing: border-box;
+}
 .demo-table-expand .el-form-item {
     width: 100%;
 }