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

Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/249

src/views/report/productionShipmentsReport/index.vue

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