材料员确认

src/views/material/lease/materialConfirm/index.vue

@@ -68,13 +68,11 @@
       <el-table-column label="租赁单位" align="center" prop="unitName" width="180px" />
       <el-table-column label="租赁工程" align="center" prop="projectName" width="180px" />
       <el-table-column label="协议号" align="center" prop="agreementCode" width="140px" show-overflow-tooltip />
-      <el-table-column
+      <el-table-column label="租赁申请单号" align="center" prop="code" width="140px" show-overflow-tooltip>
-        label="租赁申请单号"
+        <template slot-scope="{ row }">
-        align="center"
+          <span>{{ row.code || row.businessCode }}</span>
-        prop="code"
+        </template>
-        width="140px"
+      </el-table-column>
-        show-overflow-tooltip
-      ></el-table-column>
 
       <el-table-column
         label="申请数量"
@@ -186,9 +184,11 @@
           </template>
         </el-table-column>
         <!-- 操作 -->
-        <el-table-column label="操作" align="center" width="240" v-if="!isView">
+        <el-table-column label="操作" align="center" width="240">
           <template slot-scope="{ row }">
-            <el-button v-if="row.isConfirm != 2" type="primary" size="mini" @click="handleConfirm(row)">确认</el-button>
+            <el-button v-if="row.isConfirm != 2 && !isView" type="primary" size="mini" @click="handleConfirm(row)">
+              确认
+            </el-button>
             <el-button type="" size="mini" @click="openBills(row)">领料单</el-button>
             <el-button type="" size="mini" @click="openPass(row)">出门证</el-button>
           </template>
@@ -278,22 +278,22 @@
           <div class="fillIn" style="margin-top: 30px; display: flex; justify-content: space-between">
             <div class="item" style="width: 23%; display: flex; align-items: center; flex-wrap: wrap">
               <div style="width: 25%">审核：</div>
+              <div
+                style="width: 75%; display: flex; align-items: center; flex-wrap: wrap"
+                v-if="approveSignList.length > 0"
+              >
                 <div
-                  style="width: 75%; display: flex; align-items: center; flex-wrap: wrap"
+                  style="width: 80%; margin-left: 20px; height: 40px"
-                  v-if="approveSignList.length > 0"
+                  v-for="(item, index) in approveSignList"
+                  :key="index"
                 >
-                  <div
+                  <img
-                    style="width: 80%; margin-left: 20px; height: 40px"
+                    :src="item.outSignUrl"
-                    v-for="(item, index) in approveSignList"
+                    :class="{ 'is-rotate': item.outSignType == 0 }"
-                    :key="index"
+                    style="width: 40px; height: 90px; max-width: 100%"
-                  >
+                    alt=""
-                    <img
+                  />
-                      :src="item.outSignUrl"
+                </div>
-                      :class="{ 'is-rotate': item.outSignType == 0 }"
-                      style="width: 40px; height: 90px; max-width: 100%"
-                      alt=""
-                    />
-                  </div>
               </div>
             </div>
             <div class="item" style="width: 24%; display: flex; align-items: center; flex-wrap: wrap">
@@ -336,14 +336,18 @@
             <div class="item" style="width: 28%; display: flex; align-items: center">
               <div style="width: 25%">库管：</div>
               <div style="width: 75%; display: flex; align-items: center; flex-wrap: wrap" v-if="kgSignList.length > 0">
-                <img
+                <div
+                  style="width: 80%; margin-left: 20px; height: 40px"
                   v-for="(item, index) in kgSignList"
                   :key="index"
-                  :src="item.outSignUrl"
+                >
-                  style="width: 50px; height: 100px"
+                  <img
-                  :style="{ transform: item.outSignType == 0 ? 'rotate(-90deg)' : '' }"
+                    :src="item.outSignUrl"
-                  alt=""
+                    :class="{ 'is-rotate': item.outSignType == 0 }"
-                />
+                    style="width: 40px; height: 90px; max-width: 100%"
+                    alt=""
+                  />
+                </div>
               </div>
             </div>
             <div class="item" style="width: 25%; display: flex; align-items: center">
@@ -741,4 +745,7 @@ export default {
     border-collapse: collapse;
   }
 }
+.is-rotate {
+  transform: rotate(-90deg);
+}
 </style>

src/views/material/ma/type/index.vue

@@ -688,7 +688,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12" v-if="addTitle === '修改' && this.levelTemp == 2">
-            <el-form-item label="是否绑定班组" prop="keeperUserId">
+            <el-form-item label="是否绑定班组长" prop="keeperUserId">
               <el-select style="width: 100%" v-model="addFormParams.keeperUserId">
                 <el-option v-for="(item, index) in teamLeaderList" :key="index" :label="item.keeperUserName" :value="item.keeperUserId" />
               </el-select>