Merge remote-tracking branch 'origin/main'

src/api/leger/inventorydocument.js

@@ -48,22 +48,22 @@ export const document_update = (row) => {
   })
 }
 
-export const document_getListBylegerId = (toolsCodeId) => {
+export const document_getListBylegerId = (eqLedgerId) => {
   return request({
     url: '/api/inventorydocument/getList',
     method: 'get',
     params: {
-      toolsCodeId: toolsCodeId
+      eqLedgerId: eqLedgerId
     }
   })
 }
 
-export const document_tools_getListBylegerId = (eqLedgerId) => {
+export const document_tools_getListBylegerId = (toolsCodeId) => {
   return request({
     url: '/api/inventorydocument/getList',
     method: 'get',
     params: {
-      eqLedgerId: eqLedgerId
+      toolsCodeId: toolsCodeId
     }
   })
 }

src/api/leger/toolinventoryrecord.js

@@ -42,7 +42,7 @@ export const add = (row) => {
 
 export const update = (row) => {
   return request({
-    url: '/api/leger/toolinventoryrecord/submit',
+    url: '/api/leger/toolinventoryrecord/update',
     method: 'post',
     data: row
   })

src/views/leger/equipmentledger.vue

@@ -558,7 +558,8 @@ import {getList, getDetail, add, update, remove, reject, auditing} from "@/api/l
           path: "/leger/equipmentledgerDetail",
           query: {
             frameMode:"search",
-            id: row.id
+            id: row.id,
+            checkstatus: row.checkStatus
           },
         });
       },

src/views/leger/equipmentledgerDetail.vue

@@ -1,5 +1,24 @@
 <template>
   <basic-container>
+    <template >
+      <el-row :span="24">
+        <div class="check_status_class">
+       <span >
+        <el-col >
+          审核状态:
+          <el-select v-model="checkStatusValue">
+            <el-option
+              v-for="item in optionCheckStatus"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+            </el-option>
+          </el-select>
+        </el-col>
+        </span>
+        </div>
+      </el-row>
+    </template>
       <avue-tabs :option="option"
                  @change="handleChange"></avue-tabs>
       <span v-if="type.prop==='information'">
@@ -40,7 +59,7 @@
                    :upload-after="uploadAfter"
                    :upload-preview="(file) => handleUploadPreview(file)"
                    :upload-delete="(file) => handleUploadDelete(file)">
-          <template #accessoryName="scope">
+          <template #accessoryNameExt="scope">
             <el-link type="primary" :underline="false" @click="handleDownload(scope.row)">{{scope.row.prAccessoryName}}</el-link>
           </template>
           <template #menu="{row,index,size}">
@@ -92,14 +111,12 @@
     parameters_update,
     parameters_remove,
     parameters_getListBylegerId,
-    parameters_Del
   } from "@/api/leger/techparameters";
   import {
     document_add,
     document_update,
     document_remove,
     document_getListBylegerId,
-    document_Del
   } from "@/api/leger/inventorydocument";
   import {mapGetters} from "vuex";
   import website from "@/config/website";
@@ -109,6 +126,17 @@
     name: "equipmentledgerDetail",
     data () {
       return {
+        checkStatusValue: this.$route.query.checkstatus,
+          optionCheckStatus: [{
+            value: 1,
+            label: '审核中'
+          }, {
+            value: 2,
+            label: '已审核'
+          }, {
+            value: 3,
+            label: '未通过'
+          }],
         frame_class: '',
         type: {},
         shouldShowButton:{},
@@ -588,7 +616,7 @@
             },
             {
               label: '附件',
-              prop: 'accessoryName',
+              prop: 'accessoryNameExt',
               dataType: 'object',
               fileType: 'img',//img/video/audio
               type: 'upload',
@@ -628,6 +656,7 @@
         this.shouldShowButton=true;
         this.addUpdateShowButton=false;
         this.frame_class = 'frame_class1';
+        this.checkStatusValue = this.$route.query.checkstatus;
       }else{
         this.readonlyForm=false;
         this.shouldShowButton=false;
@@ -950,4 +979,16 @@
   display: flex;
   justify-content: flex-end; /* 将子元素推到容器的末端 */
 }
+
+.check_status_class {
+  display: flex;
+  justify-content: flex-end; /* 将子元素推到容器的末端 */
+}
+
+.check_status_class input.el-input__inner {
+  border: none;
+  box-shadow: none;
+  outline: none;
+  pointer-events: none;
+}
 </style>

src/views/leger/toolinventoryrecord.vue

@@ -246,7 +246,8 @@
           path: "/leger/toolinventoryrecordDetail",
           query: {
             frameMode:"search",
-            id: row.id
+            id: row.id,
+            checkstatus: row.checkStatus
           },
         });
       },
@@ -326,7 +327,8 @@
           cancelButtonText: "取消",
           type: "warning"
         }).then(() => {
-          window.open(`/api/equipmentledger/export?daf-auth=${getToken()}`);
+          var formStr = Object.keys(this.search).map(key => `${encodeURIComponent(key)}=${encodeURIComponent(this.search[key])}`).join('&');
+          window.open(`/api/leger/toolinventoryrecord/export?daf-auth=${getToken()}&${formStr}`);
         });
       },
       beforeOpen(done, type) {

src/views/leger/toolinventoryrecordDetail.vue

@@ -1,5 +1,24 @@
 <template>
   <basic-container>
+    <template >
+      <el-row :span="24">
+      <div class="check_status_class">
+       <span >
+        <el-col >
+          审核状态:
+          <el-select v-model="checkStatusValue">
+            <el-option
+              v-for="item in optionCheckStatus"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+            </el-option>
+          </el-select>
+        </el-col>
+        </span>
+      </div>
+      </el-row>
+    </template>
     <avue-tabs :option="option"
                @change="handleChange"></avue-tabs>
     <span v-if="type.prop==='information'">
@@ -55,7 +74,7 @@
                    :upload-after="uploadAfter"
                    :upload-preview="(file) => handleUploadPreview(file)"
                    :upload-delete="(file) => handleUploadDelete(file)">
-          <template #accessoryName="scope">
+          <template #accessoryNameExt="scope">
             <el-link type="primary" :underline="false" @click="handleDownload(scope.row)">{{scope.row.prAccessoryName}}</el-link>
           </template>
           <template #menu="{row,index,size}">
@@ -113,15 +132,13 @@ import {
   parameters_add,
   parameters_update,
   parameters_remove,
-  parameters_tools_getListBylegerId,
+  parameters_tools_getListBylegerId
-  parameters_Del
 } from "@/api/leger/techparameters";
 import {
   document_add,
   document_update,
   document_remove,
-  document_tools_getListBylegerId,
+  document_tools_getListBylegerId
-  document_Del
 } from "@/api/leger/inventorydocument";
 import {mapGetters} from "vuex";
 import website from "@/config/website";
@@ -131,6 +148,17 @@ export default {
   name: "equipmentledgerDetail",
   data () {
     return {
+      checkStatusValue: this.$route.query.checkstatus,
+      optionCheckStatus: [{
+        value: 1,
+        label: '审核中'
+      }, {
+        value: 2,
+        label: '已审核'
+      }, {
+        value: 3,
+        label: '未通过'
+      }],
       frame_class: '',
       type: {},
       shouldShowButton:{},
@@ -411,7 +439,7 @@ export default {
           },
           {
             label: '附件',
-            prop: 'accessoryName',
+            prop: 'accessoryNameExt',
             dataType: 'object',
             fileType: 'img',//img/video/audio
             type: 'upload',
@@ -421,7 +449,7 @@ export default {
               res: 'data',
             },
             data: {
-              fileType: "1"// 静态台账-文档清册
+              fileType: "2"// 工器具台账-文档清册
             },
             headers: {
             },
@@ -451,6 +479,7 @@ export default {
       this.shouldShowButton=true;
       this.addUpdateShowButton=false;
       this.frame_class = 'frame_class1';
+      this.checkStatusValue = this.$route.query.checkstatus;
     }else{
       this.readonlyForm=false;
       this.shouldShowButton=false;
@@ -484,7 +513,7 @@ export default {
           this.tab1_form.checkStatus="1"
           add(this.tab1_form).then(()=>{
             this.$router.push({
-              path: "/leger/equipmentledger",
+              path: "/leger/toolinventoryrecord",
               query: {
               },
             });
@@ -507,7 +536,7 @@ export default {
         }).then(() => {
           update(this.tab1_form).then(() => {
             this.$router.push({
-              path: "/leger/equipmentledger",
+              path: "/leger/toolinventoryrecord",
               query: {},
             });
             this.$message({
@@ -525,7 +554,7 @@ export default {
     },
     back() {
       if(this.$route.query.frameMode=="add") {
-        this.$router.push({path: "/leger/equipmentledger"});
+        this.$router.push({path: "/leger/toolinventoryrecord"});
       }else{
         this.updateToSearch();
         this.SearchDetail();
@@ -727,7 +756,7 @@ export default {
     submitRejectOrauditing() {
       update(this.tab1_form).then(() => {
         this.$router.push({
-          path: "/leger/equipmentledger",
+          path: "/leger/toolinventoryrecord",
           query: {},
         });
         this.$message({
@@ -749,7 +778,7 @@ export default {
       }).then(() => {
         remove(this.tab1_form.id).then(() => {
           this.$router.push({
-            path: "/leger/equipmentledger",
+            path: "/leger/toolinventoryrecord",
             query: {},
           });
           this.$message({
@@ -792,6 +821,8 @@ export default {
       window.open(`/api/system/file/download?daf-auth=${getToken()}&fileName=${row.accessoryName}`);
     },
     uploadAfter(response, done) {
+      debugger
+      console.log(response)
       // response 是服务器响应
       this.document_form.accessoryName = response.fileName;
       this.document_form.prAccessoryName = response.name;
@@ -829,8 +860,15 @@ export default {
   padding-left: 15px;
 }
 
-.container {
+.check_status_class {
   display: flex;
   justify-content: flex-end; /* 将子元素推到容器的末端 */
 }
+
+.check_status_class input.el-input__inner {
+  border: none;
+  box-shadow: none;
+  outline: none;
+  pointer-events: none;
+}
 </style>