2025-05-16

8 months ago · 23f2419837
1 changed files with 122 additions and 120 deletions
--- a/src/views/modules/changeManagement/changeRecord.vue
+++ b/src/views/modules/changeManagement/changeRecord.vue
@ -748,128 +748,130 @@

      <!-- TP&执行信息 -->
      <el-tab-pane label="TP&执行信息" name="actionInformation">
-        <el-container>
-          <el-main style="padding: 1px">
-            <el-table
-              :data="currentChooseItemList2"
-              :height="secondHeight"
-              border
-              style="width: 100%">
-              <el-table-column
-                v-for="(item,index) in columnChooseItemList2" :key="index"
-                :sortable="item.columnSortable"
-                :prop="item.columnProp"
-                :header-align="item.headerAlign"
-                :show-overflow-tooltip="item.showOverflowTooltip"
-                :align="item.align"
-                :fixed="item.fixed == ''?false:item.fixed"
-                :min-width="item.columnWidth"
-                :label="item.columnLabel">
-                <template slot-scope="scope">
-                  <span v-if="!item.columnHidden">{{scope.row[item.columnProp]}}</span>
-                  <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
-                </template>
-              </el-table-column>
-              <el-table-column
-                prop="chooseValue"
-                header-align="center"
-                align="center"
-                min-width="60"
-                label="可选值">
-              </el-table-column>
-              <el-table-column
-                prop="itemRemark"
-                header-align="center"
-                align="center"
-                min-width="120"
-                label="备注">
-              </el-table-column>
-            </el-table>
-          </el-main>
-
-          <el-main style="padding: 2px;width:220px">
-            <el-form label-position="top" :model="currentExecutionInfoData">
-              <el-row :gutter="5">
-                <el-col :span="12">
-                  <el-form-item label="原菲林编号">
-                    <el-input disabled v-model="currentExecutionInfoData.originalFilmNo" ></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="新菲林编号">
-                    <el-input disabled v-model="currentExecutionInfoData.newFilmNo" ></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="原啤刀编号">
-                    <el-input disabled v-model="currentExecutionInfoData.originalDieCuttingRuleNo" ></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="新啤刀编号">
-                    <el-input disabled v-model="currentExecutionInfoData.newDieCuttingRuleNo" ></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="原网板/印版编号">
-                    <el-input disabled v-model="currentExecutionInfoData.originalStencilNo" ></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="新网板/印版编号">
-                    <el-input disabled v-model="currentExecutionInfoData.newStencilNo" ></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="ECN执行日期">
-                    <el-date-picker disabled style="width: 100%" v-model="currentExecutionInfoData.executionDate" type="date" value-format="yyyy-MM-dd" :editable=false></el-date-picker>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-            </el-form>
-          </el-main>
-
-          <el-main style="padding: 1px">
-            <el-table
-              :data="currentChooseItemList"
-              :height="secondHeight"
-              border
-              style="width: 100%">
-              <el-table-column
-                v-for="(item,index) in columnChooseItemList" :key="index"
-                :sortable="item.columnSortable"
-                :prop="item.columnProp"
-                :header-align="item.headerAlign"
-                :show-overflow-tooltip="item.showOverflowTooltip"
-                :align="item.align"
-                :fixed="item.fixed == ''?false:item.fixed"
-                :min-width="item.columnWidth"
-                :label="item.columnLabel">
-                <template slot-scope="scope">
-                  <span v-if="!item.columnHidden">{{scope.row[item.columnProp]}}</span>
-                  <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
-                </template>
-              </el-table-column>
-              <el-table-column
-                prop="executor"
-                header-align="center"
-                align="center"
-                min-width="130"
-                label="执行人">
-              </el-table-column>
-              <el-table-column
-                prop="itemRemark"
-                header-align="center"
-                align="center"
-                min-width="150"
-                label="备注">
-              </el-table-column>
-            </el-table>
-          </el-main>
-        </el-container>
+        <el-row :gutter="5">
+          <el-col :span="9">
+            <div >
+              <el-table
+                :data="currentChooseItemList2"
+                :height="secondHeight"
+                border>
+                <el-table-column
+                  v-for="(item,index) in columnChooseItemList2" :key="index"
+                  :sortable="item.columnSortable"
+                  :prop="item.columnProp"
+                  :header-align="item.headerAlign"
+                  :show-overflow-tooltip="item.showOverflowTooltip"
+                  :align="item.align"
+                  :fixed="item.fixed == ''?false:item.fixed"
+                  :min-width="item.columnWidth"
+                  :label="item.columnLabel">
+                  <template slot-scope="scope">
+                    <span v-if="!item.columnHidden">{{scope.row[item.columnProp]}}</span>
+                    <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="chooseValue"
+                  header-align="center"
+                  align="center"
+                  min-width="60"
+                  label="可选值">
+                </el-table-column>
+                <el-table-column
+                  prop="itemRemark"
+                  header-align="center"
+                  align="center"
+                  min-width="120"
+                  label="备注">
+                </el-table-column>
+              </el-table>
+            </div>
+          </el-col>
+          <el-col :span="4">
+            <div>
+              <el-form label-position="top" :model="currentExecutionInfoData">
+                <el-row :gutter="5">
+                  <el-col :span="12">
+                    <el-form-item label="原菲林编号">
+                      <el-input disabled v-model="currentExecutionInfoData.originalFilmNo" ></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="12">
+                    <el-form-item label="新菲林编号">
+                      <el-input disabled v-model="currentExecutionInfoData.newFilmNo" ></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="12">
+                    <el-form-item label="原啤刀编号">
+                      <el-input disabled v-model="currentExecutionInfoData.originalDieCuttingRuleNo" ></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="12">
+                    <el-form-item label="新啤刀编号">
+                      <el-input disabled v-model="currentExecutionInfoData.newDieCuttingRuleNo" ></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="12">
+                    <el-form-item label="原网板/印版编号">
+                      <el-input disabled v-model="currentExecutionInfoData.originalStencilNo" ></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="12">
+                    <el-form-item label="新网板/印版编号">
+                      <el-input disabled v-model="currentExecutionInfoData.newStencilNo" ></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="12">
+                    <el-form-item label="ECN执行日期">
+                      <el-date-picker disabled style="width: 100%" v-model="currentExecutionInfoData.executionDate" type="date" value-format="yyyy-MM-dd" :editable=false></el-date-picker>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+              </el-form>
+            </div>
+          </el-col>
+          <el-col :span="11">
+            <div>
+              <el-table
+                :data="currentChooseItemList"
+                :height="secondHeight"
+                border>
+                <el-table-column
+                  v-for="(item,index) in columnChooseItemList" :key="index"
+                  :sortable="item.columnSortable"
+                  :prop="item.columnProp"
+                  :header-align="item.headerAlign"
+                  :show-overflow-tooltip="item.showOverflowTooltip"
+                  :align="item.align"
+                  :fixed="item.fixed == ''?false:item.fixed"
+                  :min-width="item.columnWidth"
+                  :label="item.columnLabel">
+                  <template slot-scope="scope">
+                    <span v-if="!item.columnHidden">{{scope.row[item.columnProp]}}</span>
+                    <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="executor"
+                  header-align="center"
+                  align="center"
+                  min-width="130"
+                  label="执行人">
+                </el-table-column>
+                <el-table-column
+                  prop="itemRemark"
+                  header-align="center"
+                  align="center"
+                  min-width="150"
+                  label="备注">
+                </el-table-column>
+              </el-table>
+            </div>
+          </el-col>
+        </el-row>
      </el-tab-pane>

-      <!-- TP&执行信息 -->
+      <!-- 会签信息 -->
      <el-tab-pane label="会签信息" name="countersignature">
        <el-table
          :data="currentChooseCSItemList"