Sfoglia il codice sorgente

【修改】调整

zhouhao 2 anni fa
parent
commit
2c53ecb77e

+ 9 - 0
src/api/engin_deposit/refund_list.js

@@ -72,3 +72,12 @@ export function examineData(params) {
     params
   })
 }
+
+// 批量审核家用
+export function secondRefund(params) {
+  return request({
+    url: '/deposit-manage/second-refund',
+    method: 'post',
+    params
+  })
+}

+ 1 - 1
src/views/deposit_home/deposit_list.vue

@@ -394,6 +394,7 @@
         <el-upload
           class="import-btn"
           v-if="!isCustomer"
+          :action="baseURL + 'student/import'"
           :http-request="handleImport"
           :file-list="importFileList"
           :show-file-list="false"
@@ -943,7 +944,6 @@ export default {
     async handleImport(param) {
       this.importLoading = true
       const file = param.file
-      console.log(file, 123)
       const formData = new FormData()
       formData.append('file', file)
       // formData.append("policyId", this.screenForm.code);

+ 39 - 10
src/views/deposit_home/refund_list.vue

@@ -247,7 +247,7 @@
               </el-radio-group> -->
                     <!-- <el-button type="primary" size="mini" @click="syncDateFn">同步资料日期</el-button> -->
                   </div>
-                  <el-form-item label="" class="fr"> > </el-form-item>
+                  <el-form-item label="" class="fr"> ></el-form-item>
                 </el-col>
               </el-row>
             </el-form>
@@ -267,9 +267,13 @@
             title="批量审核吗?"
             @onConfirm="batchExamine"
           >
-            <el-button slot="reference" size="mini" type="warning" icon="el-icon-finished"
-              >批量审核工程机已审单据</el-button
-            >
+            <el-button
+              slot="reference"
+              size="mini"
+              type="warning"
+              icon="el-icon-finished"
+            >批量审核工程机已审单据
+            </el-button>
           </el-popconfirm>
         </div>
         <div class="fr">
@@ -554,20 +558,32 @@
                   type="text"
                   class="textColor"
                   @click="examineFn(scope.row.depositManageId)"
-                  >审批</el-button
-                >
+                >审批
+                </el-button>
 
                 <el-button
                   v-if="
                     scope.row.examineStatus == 'SAVE' ||
-                    scope.row.examineStatus == 'OK' ||
-                    scope.row.examineStatus == 'FAIL'
+                      scope.row.examineStatus == 'OK' ||
+                      scope.row.examineStatus == 'FAIL'
                   "
                   type="text"
                   class="textColor"
                   @click="infoFn(scope.row.depositManageId)"
-                  >详情</el-button
+                >详情
+                </el-button>
+                <el-popconfirm
+                  style="margin-left: 10px"
+                  title="二次退押吗?"
+                  @onConfirm="secondRefund(scope.row)"
                 >
+                  <el-button
+                    slot="reference"
+                    type="text"
+                    size="mini"
+                  >二次退押
+                  </el-button>
+                </el-popconfirm>
               </template>
             </el-table-column>
           </el-table>
@@ -596,12 +612,14 @@ import {
   examineData,
   getDepositManageList,
   getDepositManageDate,
-  getDepositManagExport
+  getDepositManagExport,
+  secondRefund
 } from '@/api/engin_deposit/refund_list'
 import { downloadFiles, handleImport } from '@/utils/util'
 import ExamineDialog from '@/components/Common/examine-dialog'
 
 import RefundListDetail from './components/refund_list-detail.vue'
+
 export default {
   components: {
     RefundListDetail,
@@ -804,6 +822,14 @@ export default {
         // startDeliverTime: "",
       })
     },
+    secondRefund(row) {
+      delete row.sums1
+      delete row.sums2
+      secondRefund(row).then(res => {
+        this.$successMsg('二次退押成功')
+      })
+    },
+
     // 切换列表
     changeEnginOrderTypeFn(v) {
       // console.log(v);
@@ -952,12 +978,15 @@ export default {
 .dateStyle {
   width: 100%;
 }
+
 .import-btn {
   margin-left: 10px;
   display: inline-block;
 }
+
 .fanwei {
   display: flex;
+
   span {
     margin: 0 20px;
   }

+ 7 - 7
src/views/supply/engin/engin_list.vue

@@ -304,13 +304,13 @@
                 {{ 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="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">