退料修改

sgzb-ui/src/api/claimAndRefund/return.js

@@ -28,9 +28,17 @@ export function ApiSubmitBackApply(query) {
 }
 
 // 详情查看或编辑
-export function ApiGetView(query) {
+export function getViewByApply(query) {
   return request({
-    url: '/material/backApply/getView',
+    url: '/material/backApply/getViewByApply',
+    method: 'get',
+    params: query
+  })
+}
+// 详情查看或编辑
+export function getViewByExamine(query) {
+  return request({
+    url: '/material/backApply/getViewByExamine',
     method: 'get',
     params: query
   })
@@ -96,10 +104,19 @@ export function submitBackApplyApi(data) {
   })
 }
 
-// 退料单详情
+// 退料申请-退料单详情
-export function materialReturnNote(query) {
+export function materialReturnNoteByApply(query) {
   return request({
-    url: '/material/backApply/materialReturnNote',
+    url: '/material/backApply/materialReturnNoteByApply',
+    method: 'get',
+    params: query
+  })
+}
+
+// 退料管理-退料单详情
+export function materialReturnNoteByExamine(query) {
+  return request({
+    url: '/material/backApply/materialReturnNoteByExamine',
     method: 'get',
     params: query
   })

sgzb-ui/src/views/claimAndRefund/return/dialogForm.vue

@@ -97,7 +97,7 @@
 </template>
 <script>
 import vueEasyPrint from 'vue-easy-print';
-import { ApiGetView,materialReturnNote } from "@/api/claimAndRefund/return.js"
+import { getViewByApply,materialReturnNoteByApply } from "@/api/claimAndRefund/return.js"
 export default {
   components: { vueEasyPrint, },
   props: {
@@ -152,7 +152,7 @@ export default {
         id: this.rowObj.id,
         agreementId: this.rowObj.agreementId
       }
-      materialReturnNote(params).then(res => {
+      materialReturnNoteByApply(params).then(res => {
         this.tableData = res.data
       })
     },

sgzb-ui/src/views/claimAndRefund/return/dialogFormExame.vue

@@ -0,0 +1,219 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    v-loading.fullscreen.lock="fullscreenLoading"
+    :before-close="cancel"
+    :title="dialogTitle"
+    :visible.sync="dialogShowFlag"
+    append-to-body
+    width="800px"
+  >
+    <div id="printcontent" style="height: 500px;overflow-y: scroll;padding: 0 20px;">
+      <vue-easy-print tableShow ref="printRef">
+        <div class="order_box">
+          <div class="order_box_one">
+            <div>
+              <span>工程名称：</span><span>{{ rowObj.lotName }}</span>
+            </div>
+            <div>
+              <span>退料时间：</span><span>{{ rowObj.backTime }}</span>
+            </div>
+          </div>
+          <div class="order_box_one">
+            <div>
+              <span>退料单位：</span><span>{{ rowObj.unitName }}</span>
+            </div>
+            <div>
+              <span>编号：</span><span>{{ rowObj.code }}</span>
+            </div>
+          </div>
+        </div>
+        <el-table :data="tableData" border style="width: 100%;margin-bottom: 10px;padding: 2px;">
+          <el-table-column label="编号" align="center" type="index" />
+          <el-table-column
+            label="类型名称"
+            align="center"
+            prop="typeName"
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column
+            label="规格型号"
+            align="center"
+            prop="typeCode"
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column
+            label="退料数量"
+            align="center"
+            class-name="small-padding fixed-width"
+            width="200"
+            prop="num"
+          >
+          </el-table-column>
+          <!-- <el-table-column prop="remarks" label="备注" align="center">
+            <template slot-scope="scope">
+              <span
+                @click="remarksClick"
+                style="color: #1890ff; cursor: pointer"
+                >{{ scope.row.remarks }}</span
+              >
+            </template>
+          </el-table-column> -->
+        </el-table>
+        <div class="order_footer">
+          <div>审核：</div>
+          <div>退料：</div>
+          <div>操作人：</div>
+        </div>
+      </vue-easy-print>
+      <div>
+        <el-button type="primary" @click="print">打印</el-button>
+      </div>
+    </div>
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+      <div style="height: 500px;overflow-y: scroll;padding: 0 20px;">
+      <vue-easy-print tableShow ref="remarksPrintRef">
+        <div class="remarks_box">
+          <div class="remarks_box_title">退料编码明细</div>
+        </div>
+        <el-table :data="tableData" border style="width: 100%;margin-bottom: 10px;padding: 2px;">
+          <el-table-column label="序号" align="center" prop="dictId" />
+          <el-table-column prop="name" label="名称" align="center">
+          </el-table-column>
+          <el-table-column prop="type" label="规格型号" align="center">
+          </el-table-column>
+          <el-table-column prop="unit" label="单位" align="center">
+          </el-table-column>
+          <el-table-column prop="number" label="数量" align="center">
+          </el-table-column>
+        </el-table>
+      </vue-easy-print>
+      </div>
+      <div style="margin-top: 10px">
+        <el-button type="primary" @click="remarksPrint">打印1</el-button>
+      </div>
+    </el-dialog>
+  </el-dialog>
+</template>
+<script>
+import vueEasyPrint from 'vue-easy-print';
+import { getViewByApply,materialReturnNoteByExamine } from "@/api/claimAndRefund/return.js"
+export default {
+  components: { vueEasyPrint, },
+  props: {
+    // 弹窗是否显示
+    isShowFlag: {
+      type: Boolean,
+      default: false
+    },
+    // 对应操作数据键值
+    priKey: {
+      type: [String, Number],
+      default: ""
+    },
+    //弹窗标题
+    dialogTitle: {
+      type: String,
+      default: ""
+    },
+    rowObj: {
+      type: Object,
+      default: {}
+    }
+  },
+  watch: {
+    isShowFlag(val) {
+      if (val) {
+        this.init();
+      }
+    }
+  },
+  computed: {
+    dialogShowFlag: {
+      get() {
+        return this.isShowFlag;
+      },
+      set(v) {
+        this.$emit("update:isShowFlag", v);
+      }
+    }
+  },
+  data() {
+    return {
+      fullscreenLoading: false,
+      tableData: [],
+      open: false,
+      title: ""
+    };
+  },
+  methods: {
+    init() {
+      let params = {
+        id: this.rowObj.id,
+        agreementId: this.rowObj.agreementId
+      }
+      materialReturnNoteByExamine(params).then(res => {
+        this.tableData = res.data
+      })
+    },
+    // 取消按钮
+    cancel() {
+      this.dialogShowFlag = false;
+    },
+    print() {
+      this.$refs.printRef.print();
+    },
+    remarksClick() {
+      this.title = '查看'
+      this.open = true
+    },
+    remarksPrint() {
+      this.$refs.remarksPrintRef.print();
+    }
+
+    // submit() {
+    //   this.$refs["dynamicValidateForm"].validate(valid => {
+    //     console.log("valid", valid);
+    //     if (valid) {
+    //       console.log("11111");
+    //       this.cancel();
+    //     } else {
+    //       return false;
+    //     }
+    //   });
+    // }
+  }
+};
+</script>
+<style lang="scss" scoped>
+.order_box {
+  display: flex;
+  flex-direction: column;
+  .order_box_one {
+    width: 100%;
+    display: flex;
+    align-content: center;
+    justify-content: space-between;
+    margin-bottom: 10px;
+    :last-child {
+      margin-right: 20px;
+    }
+  }
+}
+.order_footer {
+  margin-top: 10px;
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+}
+.remarks_box {
+  display: flex;
+  // align-items: center;
+  justify-content: center;
+  .remarks_box_title {
+    margin-bottom: 10px;
+
+    font-size: 18px;
+  }
+}
+</style>

sgzb-ui/src/views/claimAndRefund/return/returnApply.vue

@@ -334,7 +334,7 @@
 
 <script>
 import { listType, getType, delType, addType, updateType, refreshCache ,getUseTypeTree} from "@/api/system/dict/type";
-import { ApiGetBackApplyList, ApiGetView, backApplyDelApi, submitBackApplyApi } from "@/api/claimAndRefund/return.js"
+import { ApiGetBackApplyList, getViewByApply, backApplyDelApi, submitBackApplyApi } from "@/api/claimAndRefund/return.js"
 import {
   getInfo, h
 } from "@/api/login";
@@ -624,9 +624,10 @@ export default {
         pageNum: this.dialogQueryParams.pageNum,
         pageSize: this.dialogQueryParams.pageSize,
       }
-      ApiGetView(params).then(res => {
+      getViewByApply(params).then(res => {
-        this.loadingList = res.rows
+        // console.log(res)
-        this.loadingTotal = res.total
+        this.loadingList = res.data.rows
+        this.loadingTotal = res.data.total
       })
     },
     /** 刷新缓存按钮操作 */

sgzb-ui/src/views/claimAndRefund/return/returnApplyAdd.vue

@@ -234,7 +234,7 @@ import {
   getDeviceTypeTree,
   getAgreementInfoById,
   submitLeaseApply,
-  getTaskDetail,
+  getViewByApply,
   getUseTypeTreee
 } from '@/api/claimAndRefund/receive'
 import { ApiSubmitBackApply } from "@/api/claimAndRefund/return"
@@ -422,7 +422,7 @@ export default {
     // console.log('this.$route.query.isEdit', this.$route.query.isEdit)
     this.isEdit = this.$route.query.isEdit;
     if (this.$route.query.taskId) {
-      this.GetTaskDetail(this.$route.query.taskId)
+      this.getViewByApply(this.$route.query.taskId)
     }
     getInfo().then(res => {
       this.companyId = res.user.companyId
@@ -488,13 +488,9 @@ export default {
     },
 
     // 获取 任务详情数据
-    async GetTaskDetail(taskId) {
+    async getViewByApply(taskId) {
-      const res = await getTaskDetail({ taskId })
+      const res = await getViewByApply({ taskId })
       const data = res.rows[0]
-      // unitId:null,
-      // proId:null,
-      // agreementId:null, //协议id
-      // agreementCode: null,
       this.queryParams.unitId = data.unitId
       this.queryParams.proId = data.projectId
       this.queryParams.leaseApplyInfo.phone = data.leaseApplyInfo.phone

sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue

@@ -512,12 +512,12 @@
 
 <script>
 import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/type";
-import { getBackAuditList, ApiGetView, ApiBackApplyAudit,ApiBackApplyRefuse } from "@/api/claimAndRefund/return.js"
+import { getBackAuditList, getViewByExamine, ApiBackApplyAudit,ApiBackApplyRefuse } from "@/api/claimAndRefund/return.js"
 import {
   getInfo, h
 } from "@/api/login";
 import { getUnitData, getProData, getAgreementInfoById, } from "@/api/claimAndRefund/receive.js"
-import dialogForm from "./dialogForm.vue";
+import dialogForm from "./dialogFormExame.vue";
 // 10:42开始日期startTime,结束日期endTime     机具类型typeId
 // http://localhost/claimAndRefund/return/returnApply
 export default {
@@ -707,7 +707,7 @@ export default {
         pageSize: this.dialogQueryParams.pageSize,
         keyWord:this.dialogQueryParams.keyWord
       }
-      ApiGetView(params).then(res => {
+      getViewByExamine(params).then(res => {
         this.loadingList = res.rows
         this.loadingTotal = res.total
       })