【修改】布局调整

src/views/deposit_commerce/components/refund_list-detail.vue

@@ -13,7 +13,9 @@
           <div class="label">
             {{ detailList.enginOrderType == 'HOME' ? '工程登录编号' : '工程信息编号' }}
           </div>
-          <div class="value">{{ detailList.refEnginRecordNo }}</div>
+          <div class="value">
+            <CopyButton :copy-text="detailList.refEnginRecordNo" /> {{ detailList.refEnginRecordNo }}
+          </div>
         </el-col>
         <!-- <el-col :xs="12" :sm="24" :lg="8" class="item">
           <div class="label">工程信息编号</div>
@@ -319,9 +321,9 @@
     </div>
 
     <h3 class="gdzl">工程资料</h3>
-    <el-button :disabled="isDis" class="batchDownload" type="primary" size="small" @click="batchDownloadFn"
-      >批量下载</el-button
-    >
+    <!--    <el-button :disabled="isDis" class="batchDownload" type="primary" size="small" @click="batchDownloadFn"-->
+    <!--      >批量下载</el-button-->
+    <!--    >-->
 
     <el-divider></el-divider>
 
@@ -389,7 +391,15 @@
       <el-row :gutter="0">
         <el-col :xs="12" :sm="12" :lg="12" class="item">
           <div class="label">申请人</div>
-          <div class="value">{{ detailList.submitName }}</div>
+          <div class="value">
+            <div class="flex">
+              <div>
+                {{ detailList.submitName }}
+              </div>
+
+              <el-button :disabled="isDis" type="primary" size="mini" @click="batchDownloadFn">批量下载</el-button>
+            </div>
+          </div>
         </el-col>
         <el-col :xs="12" :sm="12" :lg="12" class="item">
           <div class="label">申请日期</div>
@@ -669,7 +679,7 @@ export default {
     },
     //审批驳回
     async rejectFn() {
-      this.$confirm('此操作将审批订单, 是否继续?', '提示', {
+      this.$confirm('此操作将驳回订单, 是否继续?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
@@ -851,4 +861,10 @@ export default {
 .selectStyle {
   width: 100%;
 }
+.flex {
+  width: 100%;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
 </style>

src/views/deposit_commerce/deposit_list.vue

@@ -242,14 +242,13 @@
       <div class="btn-group clearfix" style="display: flex">
         <el-button type="primary" size="mini" @click="hanleDownloadFiles">导出</el-button>
         <el-upload
-          v-if="$checkBtnRole('import', $route.meta.roles)"
           class="import-btn"
           :action="baseURL + 'student/import'"
           :http-request="handleImport"
           :file-list="importFileList"
           :show-file-list="false"
         >
-          <el-button size="mini">导入</el-button>
+          <el-button size="mini" type="primary">导入</el-button>
         </el-upload>
       </div>
       <!-- 列表 -->

src/views/deposit_commerce/refund_list.vue

@@ -264,15 +264,15 @@
         </div>
         <div class="fr">
           <el-button type="primary" size="mini" @click="exportFn">导出</el-button>
-          <el-upload
-            class="import-btn"
-            action=""
-            :http-request="handleImport"
-            :file-list="importFileList"
-            :show-file-list="false"
-          >
-            <el-button type="primary" size="mini">导入</el-button>
-          </el-upload>
+          <!--          <el-upload-->
+          <!--            class="import-btn"-->
+          <!--            action=""-->
+          <!--            :http-request="handleImport"-->
+          <!--            :file-list="importFileList"-->
+          <!--            :show-file-list="false"-->
+          <!--          >-->
+          <!--            <el-button type="primary" size="mini">导入</el-button>-->
+          <!--          </el-upload>-->
         </div>
       </div>
       <!-- 列表 -->

src/views/deposit_home/components/refund_list-detail.vue

@@ -13,7 +13,10 @@
           <div class="label">
             {{ detailList.enginOrderType == 'HOME' ? '工程登录编号' : '工程信息编号' }}
           </div>
-          <div class="value">{{ detailList.refEnginRecordNo }}</div>
+          <div class="value">
+            <CopyButton :copy-text="detailList.refEnginRecordNo" />
+            {{ detailList.refEnginRecordNo }}
+          </div>
         </el-col>
         <!-- <el-col :xs="12" :sm="24" :lg="8" class="item">
           <div class="label">工程信息编号</div>
@@ -552,9 +555,9 @@
     </div>
 
     <h3 class="gdzl">工程资料</h3>
-    <el-button :readonly="isDis" class="batchDownload" type="primary" size="small" @click="batchDownloadFn"
-      >批量下载</el-button
-    >
+    <!--    <el-button :readonly="isDis" class="batchDownload" type="primary" size="small" @click="batchDownloadFn"-->
+    <!--      >批量下载</el-button-->
+    <!--    >-->
 
     <el-divider />
 
@@ -609,7 +612,14 @@
       <el-row :gutter="0">
         <el-col :xs="12" :sm="12" :lg="12" class="item">
           <div class="label">申请人</div>
-          <div class="value">{{ detailList.submitName }}</div>
+          <div class="value">
+            <div class="flex">
+              <div>
+                {{ detailList.submitName }}
+              </div>
+              <el-button :readonly="isDis" type="primary" size="mini" @click="batchDownloadFn">批量下载</el-button>
+            </div>
+          </div>
         </el-col>
         <el-col :xs="12" :sm="12" :lg="12" class="item">
           <div class="label">申请日期</div>
@@ -885,7 +895,7 @@ export default {
     },
     // 审批驳回
     async rejectFn() {
-      this.$confirm('此操作将审批订单, 是否继续?', '提示', {
+      this.$confirm('此操作将驳回订单, 是否继续?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
@@ -1172,4 +1182,10 @@ export default {
 .selectStyle {
   width: 100%;
 }
+.flex {
+  width: 100%;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
 </style>

src/views/deposit_home/deposit_list.vue

@@ -241,13 +241,7 @@
         <el-button type="primary" size="mini" @click="hanleDownloadFiles">导出 </el-button>
         <!--       -->
 
-        <el-upload
-          v-if="$checkBtnRole('import', $route.meta.roles)"
-          class="import-btn"
-          :http-request="handleImport"
-          :file-list="importFileList"
-          :show-file-list="false"
-        >
+        <el-upload class="import-btn" :http-request="handleImport" :file-list="importFileList" :show-file-list="false">
           <el-button size="mini" type="primary">导入</el-button>
         </el-upload>
       </div>

src/views/supply/engin/components/engin_detail.vue

@@ -246,6 +246,8 @@
 
     <div class="page-footer">
       <div class="footer">
+        <el-button type="primary">启用</el-button>
+        <el-button type="primary">关单</el-button>
         <el-button
           type="primary"
           @click="overData"

src/views/supply/engin/engin_list.vue

@@ -151,6 +151,8 @@
                 {{ scope.row.examineStatus | statusFilter }}
               </template>
             </el-table-column>
+            <el-table-column align="left" label="数量" sortable prop="qty" min-width="160" show-overflow-tooltip />
+            <el-table-column align="left" label="金额" sortable prop="price" min-width="160" show-overflow-tooltip />
             <el-table-column
               align="left"
               label="工程登录编号"
@@ -299,6 +301,14 @@
                 {{ computeAllowQty(scope.row.qty, scope.row.hasOrderQty) }}
               </template>
             </el-table-column>
+            <el-table-column
+              align="right"
+              label="已发货数"
+              prop="compute_kdQty"
+              min-width="100"
+              show-overflow-tooltip
+            />
+
             <el-table-column align="right" label="单价" prop="price" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.price | numToFixed }}