Merge remote-tracking branch 'origin/main'

src/api/leger/inspectionstandards.js

@@ -42,7 +42,7 @@ export const inspection_add = (row) => {
 
 export const inspection_update = (row) => {
   return request({
-    url: '/api/inspectionstandards/submit',
+    url: '/api/inspectionstandards/update',
     method: 'post',
     data: row
   })
@@ -57,7 +57,7 @@ export const inspection_getListBylegerId = (toolsCodeId) => {
   })
 }
 
-export const inspection__Del = (toolsCodeId) => {
+export const inspection_Del = (toolsCodeId) => {
   return request({
     url: '/api/inspectionstandards/del',
     method: 'post',

src/api/leger/inventorydocument.js

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

src/api/leger/techparameters.js

@@ -58,6 +58,16 @@ export const parameters_getListBylegerId = (eqLedgerId) => {
   })
 }
 
+export const parameters_tools_getListBylegerId = (toolsCodeId) => {
+  return request({
+    url: '/api/techparameters/getList',
+    method: 'get',
+    params: {
+      toolsCodeId: toolsCodeId
+    }
+  })
+}
+
 export const parameters_Del = (eqLedgerId) => {
   return request({
     url: '/api/techparameters/del',
@@ -68,3 +78,4 @@ export const parameters_Del = (eqLedgerId) => {
   })
 }
 
+

src/api/leger/toolinventoryrecord.js

@@ -49,7 +49,7 @@ export const update = (row) => {
 }
 export const auditing = (ids) => {
   return request({
-    url: '/api/toolinventoryrecord/auditing',
+    url: '/api/leger/toolinventoryrecord/auditing',
     method: 'post',
     params: {
       ids,
@@ -59,7 +59,7 @@ export const auditing = (ids) => {
 
 export const reject = (ids) => {
   return request({
-    url: '/api/toolinventoryrecord/reject',
+    url: '/api/leger/toolinventoryrecord/reject',
     method: 'post',
     params: {
       ids,

src/util/exportUtil.js

@@ -0,0 +1,20 @@
+export default {
+  excelExport : function (url, search, colArr) {
+    var filteredSearch = Object.keys(search)
+      .filter(key => !key.startsWith('$'))
+      .reduce((obj, key) => {
+        obj[key] = search[key];
+        return obj;
+      }, {});
+
+    var formStr = Object.keys(filteredSearch).map(key => {
+      let value = filteredSearch[key];
+      if (colArr.includes(key)) {
+        return `${encodeURIComponent(key)}_equal=${encodeURIComponent(value)}`;
+      } else {
+        return `${encodeURIComponent(key)}=${encodeURIComponent(value)}`;
+      }
+    }).join('&');
+    window.open(`${url}&${formStr}`);
+  }
+}

src/views/leger/equipmentledger.vue

@@ -47,7 +47,7 @@
         <el-button type="primary"
                    size="small"
                    plain
-                   @click="handleExport">导出
+                   @click="handleExport()">导出
         </el-button>
       </template>
       <template #menu="{row,index,size}">
@@ -63,6 +63,7 @@ import {getList, getDetail, add, update, remove, reject, auditing} from "@/api/l
   import {mapGetters} from "vuex";
   import website from "@/config/website";
   import {getToken} from "@/util/auth";
+  import expUtil from "@/util/exportUtil";
 
   export default {
     data() {
@@ -633,8 +634,7 @@ import {getList, getDetail, add, update, remove, reject, auditing} from "@/api/l
           cancelButtonText: "取消",
           type: "warning"
         }).then(() => {
-          var formStr = Object.keys(this.search).map(key => `${encodeURIComponent(key)}=${encodeURIComponent(this.search[key])}`).join('&');
-          window.open(`/api/equipmentledger/export?daf-auth=${getToken()}&${formStr}`);
+          expUtil.excelExport(`/api/equipmentledger/export?daf-auth=${getToken()}`, this.search, ['station', 'userStatus']);
         });
       },
       beforeOpen(done, type) {

src/views/leger/toolinventoryrecord.vue

@@ -61,6 +61,7 @@
   import {getList, getDetail, add, remove, reject, auditing} from "@/api/leger/toolinventoryrecord";
   import {mapGetters} from "vuex";
   import {getToken} from "@/util/auth";
+  import {Alert} from "element-ui";
   export default {
     data() {
       return {
@@ -241,7 +242,6 @@
       },
       // 查看操作处理
       handleDetailSearch(row) {
-        debugger
         this.$router.push({
           path: "/leger/toolinventoryrecordDetail",
           query: {

src/views/leger/toolinventoryrecordDetail.vue

@@ -101,7 +101,7 @@
   <!--   https://avuejs.com/form/form-rules.html#%E5%A4%96%E7%BD%AE%E9%AA%8C%E8%AF%81-->
 </template>
 <script>
-import {getList, getDetail, add, update, remove} from "@/api/leger/equipmentledger";
+import {getList, getDetail, add, update, remove} from "@/api/leger/toolinventoryrecord";
 import {
   inspection_add,
   inspection_update,
@@ -113,14 +113,14 @@ import {
   parameters_add,
   parameters_update,
   parameters_remove,
-  parameters_getListBylegerId,
+  parameters_tools_getListBylegerId,
   parameters_Del
 } from "@/api/leger/techparameters";
 import {
   document_add,
   document_update,
   document_remove,
-  document_getListBylegerId,
+  document_tools_getListBylegerId,
   document_Del
 } from "@/api/leger/inventorydocument";
 import {mapGetters} from "vuex";
@@ -235,16 +235,25 @@ export default {
           {
             label: "是否检验周期内",
             prop: "isInspectionPeriod",
+            type: "select",
+            search: true,
+            dicUrl: "/api/daf-system/dict/dictionary?code=yes_no",
+            props: {
+              label: "dictValue",
+              value: "dictKey"
+            },
             span: 8,
           },
           {
             label: "场站",
             prop: "stations",
-            rules: [{
-              required: true,
-              message: "请输入场站",
-              trigger: "blur"
-            }],
+            type: "select",
+            search: true,
+            dicUrl: "/api/daf-system/dict/dictionary?code=station",
+            props: {
+              label: "dictValue",
+              value: "dictKey"
+            },
             span: 8,
           },
         ]
@@ -436,9 +445,8 @@ export default {
   },
   created () {
     this.type = this.option.column[0];
-    this.option.column.push({ label: '检验标准', prop: 'inspection' },{ label: '技术参数', prop: 'parameters' },{ label: '文档清册', prop: 'document' });
     if(this.$route.query.frameMode == "search"){
-      this.option.column.push({ label: '检验标准', prop: 'Inspection' },{ label: '技术参数', prop: 'parameters' },{ label: '文档清册', prop: 'document' });
+      this.option.column.push({ label: '检验标准', prop: 'inspection' },{ label: '技术参数', prop: 'parameters' },{ label: '文档清册', prop: 'document' });
       this.readonlyForm=true;
       this.shouldShowButton=true;
       this.addUpdateShowButton=false;
@@ -545,10 +553,10 @@ export default {
         this.inspection_onLoad();
       }
     },
-    // 技术参数 新增按钮处理
+    // 检验标准 新增按钮处理
     inspection_rowSave (form, done, loading) {
       loading();
-      form.toolsCodeId = '111';
+      form.toolsCodeId = this.$route.query.id;
       inspection_add(form).then(() => {
         done(form);
         this.inspection_onLoad(this.page);
@@ -561,7 +569,7 @@ export default {
         loading();
       });
     },
-    // 技术参数 编辑按钮处理
+    // 检验标准 编辑按钮处理
     inspection_rowUpdate(form, index, done, loading) {
       inspection_update(form).then(() => {
         done(form);
@@ -575,7 +583,7 @@ export default {
       });
 
     },
-    // 技术参数 删除按钮处理
+    // 检验标准 删除按钮处理
     inspection_rowDel(form, index, done) {
       this.$confirm("确定将选择数据删除?", {
         confirmButtonText: "确定",
@@ -596,7 +604,7 @@ export default {
     // 技术参数 新增按钮处理
     parameters_rowSave (form, done, loading) {
       loading();
-      form.eqLedgerId = this.$route.query.id;
+      form.toolsCodeId = this.$route.query.id;
       parameters_add(form).then(() => {
         done(form);
         this.parameters_onLoad(this.page);
@@ -644,7 +652,7 @@ export default {
     // 文档清册 新增按钮处理
     document_rowSave(form, done, loading) {
       loading();
-      form.eqLedgerId = this.$route.query.id;
+      form.toolsCodeId = this.$route.query.id;
       document_add(form).then(() => {
         done(form);
         this.document_onLoad(this.page);
@@ -768,14 +776,14 @@ export default {
     },
     parameters_onLoad(row, params = {}) {
       this.loading = true;
-      parameters_getListBylegerId(this.$route.query.id).then(res => {
+      parameters_tools_getListBylegerId(this.$route.query.id).then(res => {
         this.parameters_data = res.data.data;
         this.loading = false;
       });
     },
     document_onLoad(row, params = {}) {
       this.loading = true;
-      document_getListBylegerId(this.$route.query.id).then(res => {
+      document_tools_getListBylegerId(this.$route.query.id).then(res => {
         this.document_data = res.data.data;
         this.loading = false;
       });