From 16ad9329ca94ce9567633de1cc0da3b4517b79de Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Fri, 1 Mar 2024 17:58:28 +0800
Subject: [PATCH] =?UTF-8?q?2024-3-1=20=E4=BA=A7=E5=93=81=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96+=E7=BB=B4=E4=BF=AE?=
 =?UTF-8?q?=E5=B7=A5=E5=8D=95=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/device/repairOrder/index.vue | 125 +++++++------
 src/views/wms/product/index.vue        | 248 +++++++------------------
 2 files changed, 129 insertions(+), 244 deletions(-)

diff --git a/src/views/device/repairOrder/index.vue b/src/views/device/repairOrder/index.vue
index 6edbc7a4..f63a7099 100644
--- a/src/views/device/repairOrder/index.vue
+++ b/src/views/device/repairOrder/index.vue
@@ -283,7 +283,12 @@
         prop="orderCode"
         width="200"
       />
-      <el-table-column label="设备编码" align="center" prop="equipmentCode" width="150"/>
+      <el-table-column
+        label="设备编码"
+        align="center"
+        prop="equipmentCode"
+        width="150"
+      />
       <el-table-column
         label="故障描述"
         align="center"
@@ -824,8 +829,8 @@
             <el-descriptions
               :column="3"
               border
-              :contentStyle="CS1"
-              :label-style="LS1"
+              :contentStyle="CS_WRITE"
+              :label-style="LS_WRITE"
             >
               <el-descriptions-item label="维修工单号">{{
                 form.workCode
@@ -891,7 +896,7 @@
             <el-descriptions :column="1" border>
               <el-descriptions-item
                 label="维修前故障图片"
-                :contentStyle="CS"
+                :contentStyle="CS_WRITE_IMG"
                 :label-style="LS_WRITE_IMG"
               >
                 <div class="view_picture_body">
@@ -906,7 +911,7 @@
             <el-descriptions :column="1" border>
               <el-descriptions-item
                 label="维修后故障图片"
-                :contentStyle="CS"
+                :contentStyle="CS_WRITE_IMG"
                 :label-style="LS_WRITE_IMG"
               >
                 <div class="view_picture_body">
@@ -921,13 +926,7 @@
           </el-tab-pane>
 
           <el-tab-pane label="检查项信息">
-            <el-table
-              :data="detailList"
-              border
-              :contentStyle="CS"
-              :label-style="LS"
-              :span-method="objectSpanMethod"
-            >
+            <el-table :data="detailList" border :span-method="objectSpanMethod">
               <el-table-column prop="itemTypeName" label="检查类型" width="100">
               </el-table-column>
               <el-table-column prop="itemName" label="检查项名称" width="150">
@@ -1186,10 +1185,10 @@
         <el-tabs type="border-card">
           <el-tab-pane label="维修基本信息">
             <el-descriptions
-              :column="2"
+              :column="3"
               border
-              :contentStyle="CS"
-              :label-style="LS"
+              :contentStyle="CS_VIEW"
+              :label-style="LS_VIEW"
             >
               <el-descriptions-item label="维修工单号">{{
                 form.workCode
@@ -1245,6 +1244,13 @@
               <el-descriptions-item label="维修班组">{{
                 form.workTeam
               }}</el-descriptions-item>
+            </el-descriptions>
+            <el-descriptions
+              :column="1"
+              border
+              :contentStyle="CS_VIEW_IMG"
+              :label-style="LS_VIEW_IMG"
+            >
               <el-descriptions-item label="维修班组人员">{{
                 form.workTeamPerson
               }}</el-descriptions-item>
@@ -1255,38 +1261,36 @@
             <el-descriptions :column="1" border>
               <el-descriptions-item
                 label="维修前故障图片"
-                :contentStyle="CS"
+                :contentStyle="CS_VIEW_IMG"
                 :label-style="LS_VIEW_IMG"
               >
-                <el-image
-                  v-for="(item, index) in urlBeforeLists"
-                  :key="index"
-                  :src="item"
-                ></el-image
-              ></el-descriptions-item>
+                <div class="view_picture_body">
+                  <el-image
+                    v-for="(item, index) in urlBeforeLists"
+                    :key="index"
+                    :src="item"
+                  ></el-image>
+                </div>
+              </el-descriptions-item>
             </el-descriptions>
             <el-descriptions :column="1" border>
               <el-descriptions-item
                 label="维修后故障图片"
-                :contentStyle="CS"
+                :contentStyle="CS_VIEW_IMG"
                 :label-style="LS_VIEW_IMG"
               >
-                <el-image
-                  v-for="(item, index) in urlAfterLists"
-                  :key="index"
-                  :src="item"
-                ></el-image
-              ></el-descriptions-item>
+                <div class="view_picture_body">
+                  <el-image
+                    v-for="(item, index) in urlAfterLists"
+                    :key="index"
+                    :src="item"
+                  ></el-image>
+                </div>
+              </el-descriptions-item>
             </el-descriptions>
           </el-tab-pane>
           <el-tab-pane label="查看检查项信息">
-            <el-table
-              :data="detailList"
-              border
-              :contentStyle="CS"
-              :label-style="LS"
-              :span-method="objectSpanMethod"
-            >
+            <el-table :data="detailList" border :span-method="objectSpanMethod">
               <el-table-column prop="itemTypeName" label="检查类型" width="100">
               </el-table-column>
               <el-table-column prop="itemName" label="检查项名称" width="150">
@@ -1555,39 +1559,41 @@ export default {
     return {
       //委外表格格式
       WCS: {
-        "text-align": "center",
+        "text-align": "left",
       },
       WLS: {
-        "text-align": "center",
         width: "225px",
       },
-      CS: {
-        "text-align": "center",
+      //查看维修表格
+      CS_VIEW: {
+        width: "183px",
       },
-      CS1: {
-        "text-align": "center",
-        width: "250px",
+      LS_VIEW: {
+        width: "150px",
       },
-      LS: {
-        "text-align": "center",
-        width: "225px",
+      //图片 以及图面上面两行
+      LS_VIEW_IMG: {
+        width: "145px",
       },
-      LS1: {
-        "text-align": "center",
-        width: "250px",
+      CS_VIEW_IMG: {
+        width: "817px",
       },
-      //图片表格样式 查看功能
-      LS_VIEW_IMG: {
-        "text-align": "center",
-        width: "225px",
+      //填写维修表格
+      CS_WRITE: {
+        width: "200px",
       },
-      //图片格式样式 填写功能
+      LS_WRITE: {
+        width: "200px",
+      },
+      //图片 以及图面上面两行
       LS_WRITE_IMG: {
-        "text-align": "center",
-        width: "235px",
+        width: "200px",
+      },
+      CS_WRITE_IMG: {
+        width: "1000px",
       },
       //故障描述
-      workFaultDescOption : [],
+      workFaultDescOption: [],
       //维修处理措施模糊选择
       repairMeasuresOption: [],
       //原因分析模糊选择
@@ -1974,11 +1980,10 @@ export default {
             urlBeforeLists.push(item.url);
           });
           this.urlBeforeLists = urlBeforeLists;
-        }else{
+        } else {
           this.urlBeforeLists = null;
         }
 
-        
         //遍历response.data.afterRepairFiles
         if (response.data.afterRepairFiles != null) {
           var afterNewFiles = [];
@@ -1995,7 +2000,7 @@ export default {
             urlAfterLists.push(item.url);
           });
           this.urlAfterLists = urlAfterLists;
-        }else{
+        } else {
           this.urlAfterLists = null;
         }
 
diff --git a/src/views/wms/product/index.vue b/src/views/wms/product/index.vue
index 535b20e8..b1559a74 100644
--- a/src/views/wms/product/index.vue
+++ b/src/views/wms/product/index.vue
@@ -396,190 +396,64 @@
       append-to-body
     >
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
-        <el-row :gutter="10" class="mb8">
-          <el-col :span="12">
-            <el-form-item label="产品编号" prop="productCode">
-              <el-input
-                v-model="form.productCode"
-                placeholder=""
-                disabled
-                style="width: 320px"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="品类" prop="category">
-              <el-input
-                v-model="form.category"
-                placeholder=""
-                disabled
-                style="width: 320px"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="10" class="mb8">
-          <el-col :span="12">
-            <el-form-item label="每PC单圈" prop="pc">
-              <el-input
-                v-model="form.pc"
-                placeholder=""
-                disabled
-                style="width: 320px"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="标准效率" prop="iei">
-              <el-input
-                v-model="form.iei"
-                placeholder=""
-                disabled
-                style="width: 320px"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="10" class="mb8">
-          <el-col :span="12">
-            <el-form-item label="标准用人" prop="manStandar">
-              <el-input
-                v-model="form.manStandar"
-                placeholder=""
-                disabled
-                style="width: 320px"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="喷药方式" prop="sprayWay">
-              <el-input
-                v-model="form.sprayWay"
-                placeholder=""
-                disabled
-                style="width: 320px"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="10" class="mb8">
-          <el-col :span="12">
-            <el-form-item label="白坯直径" prop="blankDiameter">
-              <el-input
-                v-model="form.blankDiameter"
-                placeholder=""
-                disabled
-                style="width: 320px"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="白坯物料号" prop="blankNo">
-              <el-input
-                v-model="form.blankNo"
-                placeholder=""
-                disabled
-                style="width: 320px"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="10" class="mb8">
-          <el-col :span="12">
-            <el-form-item label="标准喷药量" prop="sprayVolume">
-              <el-input
-                v-model="form.sprayVolume"
-                placeholder=""
-                disabled
-                style="width: 320px"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="药液料号" prop="liquidNo">
-              <el-input
-                v-model="form.liquidNo"
-                placeholder=""
-                disabled
-                style="width: 320px"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="10" class="mb8">
-          <el-col :span="12">
-            <el-form-item label="标准内膜用量" prop="endometrialDosage">
-              <el-input
-                v-model="form.endometrialDosage"
-                placeholder=""
-                disabled
-                style="width: 320px"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="标准外模用量(KG/PC)" prop="outerFilmDosage">
-              <el-input
-                v-model="form.outerFilmDosage"
-                placeholder=""
-                disabled
-                style="width: 320px"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="10" class="mb8">
-          <el-col :span="12">
-            <el-form-item label="支架" prop="support">
-              <el-input
-                v-model="form.support"
-                placeholder=""
-                disabled
-                style="width: 320px"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="支架物料号" prop="supportNo">
-              <el-input
-                v-model="form.supportNo"
-                placeholder=""
-                disabled
-                style="width: 320px"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="10" class="mb8">
-          <el-col :span="12">
-            <el-form-item label="吸塑" prop="pvc">
-              <el-input
-                v-model="form.pvc"
-                placeholder=""
-                disabled
-                style="width: 320px"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="支架盘" prop="supportPlate">
-              <el-input
-                v-model="form.supportPlate"
-                placeholder=""
-                disabled
-                style="width: 320px"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-form-item label="其它" prop="other">
-          <el-input
-            v-model="form.other"
-            placeholder=""
-            disabled
-            style="width: 320px"
-          />
-        </el-form-item>
+        <el-descriptions
+              :column="2"
+              border
+              :contentStyle="CS"
+              :label-style="LS"
+            >
+              <el-descriptions-item label="产品编号">{{
+                form.productCode
+              }}</el-descriptions-item>
+              <el-descriptions-item label="品类">{{
+                form.category
+              }}</el-descriptions-item>
+              <el-descriptions-item label="每PC单圈">{{
+                form.pc
+              }}</el-descriptions-item>
+              <el-descriptions-item label="标准效率">{{
+                form.iei
+              }}</el-descriptions-item>
+              <el-descriptions-item label="标准用人">{{
+                form.manStandar
+              }}</el-descriptions-item>
+              <el-descriptions-item label="喷药方式">{{
+                form.sprayWay
+              }}</el-descriptions-item>
+              <el-descriptions-item label="白坯直径">{{
+                form.blankDiameter
+              }}</el-descriptions-item>
+              <el-descriptions-item label="白胚物料号">{{
+                form.blankNo
+              }}</el-descriptions-item>
+              <el-descriptions-item label="标准喷药量">{{
+                form.sprayVolume
+              }}</el-descriptions-item>
+              <el-descriptions-item label="药液料号">{{
+                form.liquidNo
+              }}</el-descriptions-item>
+              <el-descriptions-item label="标准内膜用量">{{
+                form.endometrialDosage
+              }}</el-descriptions-item>
+              <el-descriptions-item label="标准外膜用量（KG/PC）">{{
+                form.outerFilmDosage
+              }}</el-descriptions-item>
+              <el-descriptions-item label="支架">{{
+                form.support
+              }}</el-descriptions-item>
+              <el-descriptions-item label="支架物料号">{{
+                form.supportNo
+              }}</el-descriptions-item>
+              <el-descriptions-item label="吸塑">{{
+                form.pvc
+              }}</el-descriptions-item>
+              <el-descriptions-item label="支架盘">{{
+                form.supportPlate
+              }}</el-descriptions-item>
+              <el-descriptions-item label="其他">{{
+                form.other
+              }}</el-descriptions-item>
+            </el-descriptions>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="cancelAttached">取 消</el-button>
@@ -602,6 +476,12 @@ export default {
   dicts: ["sys_normal_disable", "material_type"],
   data() {
     return {
+      LS: {
+        width: "250px",
+      },
+      CS: {
+        width: "250px",
+      },
       // 遮罩层
       loading: true,
       // 选中数组