材料站-退料单签名

src/views/materialsStation/equipment/equipmentRecord/index.vue

@@ -226,13 +226,13 @@
       <el-table-column label="数量" align="center" prop="allNum" :show-overflow-tooltip="true">
         <template slot-scope="scope">
           <!-- 当 manageType 为 '编码' 时，使用可点击的 span -->
-          <span class="clickText" v-if="scope.row.manageType == '编码'" @click="openRecords(scope.row)">
+          <span class="clickText" @click="openRecords(scope.row)">
             {{ scope.row.allNum }}
           </span>
           <!-- 否则，直接显示数字 -->
-          <span v-else>
+          <!-- <span v-else>
             {{ scope.row.allNum }}
-          </span>
+          </span> -->
         </template>
       </el-table-column>
     </el-table>
@@ -276,7 +276,16 @@
         ></el-table-column>
         <el-table-column label="机具名称" align="center" prop="typeName" :show-overflow-tooltip="true" />
         <el-table-column label="规格型号" align="center" prop="typeModelName" :show-overflow-tooltip="true" />
-        <el-table-column label="设备编码" align="center" prop="maCode" :show-overflow-tooltip="true" />
+        <el-table-column label="设备编码" align="center" prop="maCode" :show-overflow-tooltip="true">
+          <template slot-scope="{ row }">
+            <span>{{ row.maCode || '-' }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="数量" align="center" prop="storeNum" :show-overflow-tooltip="true" />
+        <el-table-column label="操作人" align="center" prop="creator" :show-overflow-tooltip="true" />
+        <el-table-column label="出库时间" align="center" prop="outTime" :show-overflow-tooltip="true" width="180" />
+        <el-table-column label="班组" align="center" prop="teamName" :show-overflow-tooltip="true" />
+        <el-table-column label="工程名称" align="center" prop="proName" :show-overflow-tooltip="true" width="180"/>
       </el-table>
       <pagination
         v-show="dialogTotal > 0"

src/views/materialsStation/toolsBack/back/component/dialogFormByCq.vue

@@ -105,33 +105,38 @@
 
           <div class="order_footer">
             <!-- <div>审核人：</div> -->
-            <div class="item" style="width: 28%; display: flex; align-items: center; flex-wrap: wrap">
+            <div class="item" style="width: 50%; display: flex; align-items: center; flex-wrap: wrap">
               <div style="width: 35%">审核人：</div>
-              <div style="width: 65%; display: flex; align-items: center; flex-wrap: wrap" v-if="directAuditSignUrl">
+              <div
-                <div style="width: 80%; margin-left: 10px">
+                style="width: 65%; display: flex; align-items: center; flex-wrap: wrap"
+                v-if="approveSignList.length > 0"
+              >
+                <div style="width: 80%; margin-left: 10px" v-for="(item, index) in approveSignList" :key="index">
                   <img
-                    :src="directAuditSignUrl"
+                    :src="item.outSignUrl"
-                    style="width: 40px; height: 100px; transform: rotate(-90deg); max-width: 100%"
+                    style="width: 40px; height: 100px; max-width: 100%"
+                    :style="{transform: item.outSignType == 0 ? 'rotate(-90deg)' : ''}"
                     alt=""
                   />
                 </div>
               </div>
             </div>
-            <div class="item" style="width: 24%; display: flex; align-items: center; flex-wrap: wrap">
+            <div class="item" style="width: 50%; display: flex; align-items: center; flex-wrap: wrap">
               <div style="width: 35%">退料人：</div>
               <div style="width: 65%; display: flex; align-items: center; flex-wrap: wrap" v-if="backSignUrl">
                 <div style="width: 80%; margin-left: 10px">
                   <img
                     :src="backSignUrl"
-                    style="width: 40px; height: 100px; transform: rotate(-90deg); max-width: 100%"
+                    style="width: 40px; height: 100px; max-width: 100%"
+                    :style="{transform: item.outSignType == 0 ? 'rotate(-90deg)' : ''}"
                     alt=""
                   />
                 </div>
               </div>
             </div>
-            <div class="item" style="width: 24%; display: flex; align-items: center; flex-wrap: wrap">
+            <!-- <div class="item" style="width: 24%; display: flex; align-items: center; flex-wrap: wrap">
               <span>制单：</span>
-            </div>
+            </div> -->
           </div>
         </div>
       </vue-easy-print>
@@ -199,11 +204,15 @@
             <div class="order_footer">
               <div class="item" style="width: 28%; display: flex; align-items: center; flex-wrap: wrap">
                 <div style="width: 35%">审核人：</div>
-                <div style="width: 65%; display: flex; align-items: center; flex-wrap: wrap" v-if="directAuditSignUrl">
+                <div
-                  <div style="width: 80%; margin-left: 10px">
+                  style="width: 65%; display: flex; align-items: center; flex-wrap: wrap"
+                  v-if="approveSignList.length > 0"
+                >
+                  <div style="width: 80%; margin-left: 10px" v-for="(item, index) in approveSignList" :key="index">
                     <img
-                      :src="directAuditSignUrl"
+                      :src="item.outSignUrl"
-                      style="width: 40px; height: 100px; transform: rotate(-90deg); max-width: 100%"
+                      style="width: 40px; height: 100px; max-width: 100%"
+                      :style="{transform: item.outSignType == 0 ? 'rotate(-90deg)' : ''}"
                       alt=""
                     />
                   </div>
@@ -215,7 +224,8 @@
                   <div style="width: 80%; margin-left: 10px">
                     <img
                       :src="backSignUrl"
-                      style="width: 40px; height: 100px; transform: rotate(-90deg); max-width: 100%"
+                      style="width: 40px; height: 100px; max-width: 100%"
+                      :style="{transform: item.outSignType == 0 ? 'rotate(-90deg)' : ''}"
                       alt=""
                     />
                   </div>
@@ -288,7 +298,7 @@ export default {
       tableSubData: [],
       open: false,
       title: '',
-      directAuditSignUrl: '',
+      approveSignList: [],
       backSignUrl: ''
     }
   },
@@ -301,9 +311,9 @@ export default {
       getBackApplyInfo(this.rowObj.id).then(res => {
         console.log(res)
         this.tableData = res.data.backApplyDetailsList
-        this.directAuditSignUrl = res.data.backApplyInfo.directAuditSignUrl
+        this.approveSignList = res.data.backApplyInfo.approveSignList
+        console.log('🚀 ~ 审核 ~ this.approveSignList:', this.approveSignList)
         this.backSignUrl = res.data.backApplyInfo.backSignUrl
-        console.log('222222222', this.directAuditSignUrl)
       })
     },
     // 取消按钮