Merge remote-tracking branch 'origin/project9-8' into project9-8

src/api/equipment/printingCheck/index.js

@@ -28,3 +28,11 @@ export function deleteYs(id) {
     method: 'delete'
   })
 }
+
+// 获取印刷详情接口
+export function detailYs(id) {
+  return request({
+    url: '/wbwarehouseys/detail/' + id,
+    method: 'get'
+  })
+}

src/api/magnagement.js

@@ -45,6 +45,19 @@ export function recycle(data) {
     }
   })
 }
+// 再利用中的废弃
+export function recycleAndAbandon(data) {
+  return request({
+    url: '/wbwarehouse/recycleAndAbandon',
+    method: 'put',
+    data,
+    headers: {
+      'Content-Type': 'application/json;charset=UTF-8'
+    }
+  })
+}
+
+
 // 逻辑删除基础信息接口
 export function deletedevice(id) {
   return request({

src/layout/components/TagsView/index.vue

@@ -150,13 +150,15 @@ export default {
       })
     },
     closeSelectedTag(view) {
+      // 关闭标签页清除存储的筛选条件数据
+      this.$store.dispatch('searchSave/clearOneParams',this.$route.path)
       this.$store.dispatch('tagsView/delView', view).then(({ visitedViews }) => {
         if (this.isActive(view)) {
           this.toLastView(visitedViews, view)
         }
-        if (view.path === '/processManagement/deviceReuse') {
-          if (sessionStorage.getItem('recycleform') !== null) { sessionStorage.removeItem('recycleform') }
-        }
+        // if (view.path === '/processManagement/deviceReuse') {
+        //   if (sessionStorage.getItem('recycleform') !== null) { sessionStorage.removeItem('recycleform') }
+        // }
       })
     },
     closeOthersTags() {

src/store/modules/searchSave.js

@@ -18,7 +18,8 @@ const mutations = {
     state.searchParams = {}
   },
   CLEAR_ONE_PARAMS: (state, path) => {
-    path && state.searchParams[path] && delete state.searchParams[path]
+    // path && state.searchParams[path] && delete state.searchParams[path]
+    state.searchParams[path] = ''
   }
 }
 
@@ -32,7 +33,10 @@ const actions = {
     commit('RSET_SEARCH_PARAMS')
   },
   clearOneParams({ commit }, path) {
-    commit('CLEAR_ONE_PARAMS', path)
+    // 延时清除缓存数据，防止路由离开前重新赋值
+    setTimeout(() => {
+      commit('CLEAR_ONE_PARAMS', path)
+    }, 2000)
   }
 }
 

src/views/equipment/basicInfo.vue

@@ -310,6 +310,7 @@ export default {
   },
   /** 路由离开前存储筛选条件*/
   beforeRouteLeave(to, from, next) {
+    console.log("離開路由前賦值")
     this.$store.dispatch('searchSave/searchParamsSet', {
       path: this.$route.path,
       param: {

src/views/equipment/income.vue

@@ -71,6 +71,11 @@
             <el-input v-model="form.plocation" placeholder="请输入位置" :style="{ width: '400px', height: '30px' }" :maxlength="100" />
           </el-form-item>
         </el-col>
+        <el-col :span="12">
+          <el-form-item label="寿命:" style="flex-basis: 50%;" prop="psm">
+            <el-input v-model="form.psm" placeholder="请输入寿命" :style="{ width: '400px', height: '30px' }" :maxlength="9" />
+          </el-form-item>
+        </el-col>
       </el-row>
     </el-form>
     <el-form label-width="80px">
@@ -78,7 +83,7 @@
         <el-col :span="12">
           <el-form-item style="flex-basis: 50%;">
             <el-button type="primary" @click="submitForm">提交</el-button>
-            <el-button  @click="resetQuery">重置</el-button>
+            <el-button @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-col>
       </el-row>
@@ -104,7 +109,8 @@ export default {
         phd: '',
         flag: 1,
         ptype: 1,
-        pstatus: 0
+        pstatus: 0,
+        psm: undefined
       },
       tableData: [], // 表格数据
       selectedRows: [],
@@ -125,6 +131,10 @@ export default {
           { required: true, message: '请输入位置', trigger: 'blur' },
           { pattern: /^[^[\uD800-\uDFFF]+$/, message: '不能包含表情符号', trigger: 'change' },
           { max: 100, message: '输入长度不能超过100个字符', trigger: 'change' }
+        ],
+        psm: [
+          { required: true, message: '请输入寿命', trigger: 'blur' },
+          { pattern: /^[1-9]\d*$/, message: '请输入正整数', trigger: 'blur' }
         ]
       }
     }
@@ -161,7 +171,8 @@ export default {
         phd: '',
         flag: 1,
         ptype: 1,
-        pstatus: 0
+        pstatus: 0,
+        psm: undefined
       }
       this.tableData = []
     },
@@ -298,7 +309,7 @@ export default {
         lot: '',
         plocation: '',
         phd: '',
-        psm: '',
+        psm: undefined,
         pzl: '',
         prank: ''
       }
@@ -316,18 +327,16 @@ export default {
         this.$message.warning('请先确定表格数据')
         return
       }
-      this.$confirm('是否确认操作?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        // const newRow = {
-        //   plocation
-        // }
-        this.$refs.form.validate((valid) => {
-          if (valid) {
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          this.$confirm('是否确认操作?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
             console.log('form', this.form)
             this.tableData.forEach(item => {
+              item.psm = this.form.psm
               item.plocation = this.form.plocation
             })
             add(this.tableData).then(res => {
@@ -336,16 +345,17 @@ export default {
                 this.$message.success('操作成功')
                 this.tableData = []
                 this.form.plocation = ''
+                this.form.psm = undefined
               } else if (res.code === null) {
                 this.$message.error(res.message)
                 // this.tableData = []
                 // this.form.plocation = ''
               }
             })
-          } else {
-            // 校验失败，显示错误信息或进行其他操作
-          }
-        })
+          })
+        } else {
+          // 校验失败，显示错误信息或进行其他操作
+        }
       })
     },
     // 调数据字典查询

src/views/equipment/inventoryRecord/index.vue

@@ -225,7 +225,7 @@
 </template>
 
 <script>
-import {exportInventoryRecord, exportTest, findSingleLogDetail, listLog} from '@/api/processMangement/InventoryRecord'
+import { exportInventoryRecord, exportTest, findSingleLogDetail, listLog } from '@/api/processMangement/InventoryRecord'
 import BaseTable from '@/components/Table/BaseTable/index.vue'
 import { BaseTableArgumentsTest } from '@/components/Table/AllTableArguments/BaseTableArguments'
 import { getDictData } from '@/api/equipment/application'
@@ -449,6 +449,7 @@ export default {
   },
   created() {
     if (this.$store.getters.searchParams[this.$route.path]) {
+      console.log('111', this.$store.getters.searchParams[this.$route.path])
       const { searchParams } = this.$store.getters; const { path } = this.$route
       const param = JSON.parse(searchParams[path]) // 保留着的查询条件
       this.queryParams = { ...param }
@@ -592,7 +593,7 @@ export default {
       }
       this.openDetails = true
     },
-    test(){
+    test() {
       exportTest().then(response => {
         const blob = new Blob([response])
         const downloadElement = document.createElement('a')

src/views/processManagement/deviceReuse/index.vue

@@ -26,7 +26,7 @@
         <el-col :span="12">
           <el-form-item label="厚度:" style="flex-basis: 50%;" prop="phd">
             <span>{{ form.phd }}</span>
-<!--            <el-input ref="input4" v-model="form.phd" :readonly="true" placeholder="请输入厚度" clearable style="width: 400px" :maxlength="8" @keyup.enter.native="handelTab(4,$event)" />-->
+            <!--            <el-input ref="input4" v-model="form.phd" :readonly="true" placeholder="请输入厚度" clearable style="width: 400px" :maxlength="8" @keyup.enter.native="handelTab(4,$event)" />-->
           </el-form-item>
         </el-col>
       </el-row>
@@ -35,9 +35,9 @@
           <el-form-item label="psm:" style="flex-basis: 50%;" prop="psm">
             <el-input ref="input5" v-model="form.psm" placeholder="请输入psm" clearable style="width: 400px" :maxlength="8" @keyup.enter.native="handelTab(5,$event)" />
           </el-form-item>
-<!--          <el-form-item v-if="form.exitPsm" label="当前psm:">-->
-<!--            <span>{{ form.currentPsm }}</span>-->
-<!--          </el-form-item>-->
+          <!--          <el-form-item v-if="form.exitPsm" label="当前psm:">-->
+          <!--            <span>{{ form.currentPsm }}</span>-->
+          <!--          </el-form-item>-->
         </el-col>
         <el-col :span="12">
           <el-form-item label="pzl:" style="flex-basis: 50%;" prop="pzl">
@@ -57,9 +57,47 @@
       <!--      </el-row>-->
       <el-row :gutter="40">
         <el-col :span="12" style="padding-left: 10%;">
-          <el-form-item label="印刷原因:" style="flex-basis: 50%;" prop="fq_yy">
-            <span>{{ getDictValue(form.fq_yy) || '无' }}</span>
-<!--            <el-input ref="input7" v-model="form.fq_yy" :readonly="true" placeholder="请输入印刷原因" clearable style="width: 400px" :maxlength="100" @keyup.enter.native="handelTab(7,$event)" />-->
+          <el-form-item label="废弃原因:" style="flex-basis: 50%;" prop="fq_yy" :rules="[{required: this.type === '3', message: '请选择废弃原因', trigger: 'blur' }]">
+            <el-select
+              v-model.trim="form.fq_yy"
+              style="width: 400px"
+              clearable
+              placeholder="请选择废弃原因"
+            >
+              <el-option
+                v-for="(dict,index) in pgxList"
+                :key="index"
+                :label="dict.dictValue"
+                :value="dict.dictLabel"
+              />
+            </el-select>
+            <!--            <span v-if="!form.fq_yy">无</span>-->
+            <!--            <span v-else>{{ getDictValue(form.fq_yy)}}</span>-->
+            <!--            <el-input ref="input7" v-model="form.fq_yy" :readonly="true" placeholder="请输入印刷原因" clearable style="width: 400px" :maxlength="100" @keyup.enter.native="handelTab(7,$event)" />-->
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="fq_bz:" style="flex-basis: 50%;" prop="fq_bz" :rules="[{required: this.type === '3', message: '请输入fq_bz', trigger: 'blur' }]">
+            <el-input ref="input7" v-model="form.fq_bz" placeholder="请输入fq_bz" clearable style="width: 400px" :maxlength="100" @keyup.enter.native="handelTab(7,$event)" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="40">
+        <el-col :span="12" style="padding-left: 10%;">
+          <el-form-item label="fq_dd:" style="flex-basis: 50%;" prop="fq_dd">
+            <el-input ref="input8" v-model="form.fq_dd" placeholder="请输入fq_bz" clearable style="width: 400px" :maxlength="100" @keyup.enter.native="handelTab(8,$event)" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="fq_mcode:" style="flex-basis: 50%;" prop="fq_mcode">
+            <el-input ref="input9" v-model="form.fq_mcode" placeholder="请输入fq_mcode" clearable style="width: 400px" :maxlength="100" @keyup.enter.native="handelTab(9,$event)" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="40">
+        <el-col :span="12" style="padding-left: 10%;">
+          <el-form-item label="fq_dbxi:" style="flex-basis: 50%;" prop="fq_dbxi">
+            <el-input ref="input10" v-model="form.fq_dbxi" placeholder="请输入fq_dbxi" clearable style="width: 400px" :maxlength="100" @keyup.enter.native="handelTab(10,$event)" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -70,6 +108,7 @@
           <el-form-item style="flex-basis: 50%;">
             <el-button type="primary" @click="submitForm">提交</el-button>
             <el-button @click="resetQuery">重置</el-button>
+            <el-button style="background-color: #EFBF16FF; color: #FFFFFF;border: 1px solid #EFBF16FF" @click="abandon">废弃</el-button>
           </el-form-item>
         </el-col>
       </el-row>
@@ -78,7 +117,7 @@
 </template>
 
 <script>
-import { recycle } from '@/api/magnagement'
+import { recycle, recycleAndAbandon } from '@/api/magnagement'
 import { getWbWarehouseByLot } from '@/api/processMangement/InventoryRecord'
 import { getDictData } from '@/api/equipment/application'
 
@@ -86,6 +125,8 @@ export default {
   name: 'Role',
   data() {
     return {
+      // 操作类型 1:提交,2:重置,3废弃
+      type: '1',
       pgxList: [],
       // 缓存判断
       recycleexist: false,
@@ -101,7 +142,13 @@ export default {
         fq_ys: '',
         flag: 1,
         ptype: '',
-        pstatus: 0
+        pstatus: 0,
+        // 只在前端显示原因,
+        fq_yy: null,
+        fq_bz: null,
+        fq_dd: null,
+        fq_mcode: null,
+        fq_dbxi: null
       },
       historForm: {},
       rule: {
@@ -159,6 +206,30 @@ export default {
     }
   },
   methods: {
+    abandon() {
+      this.$confirm('是否确认废弃?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(res => {
+        this.type = '3'
+        this.$nextTick().then(() => {
+          this.$refs.form.validate(valid => {
+            if (valid) {
+              recycleAndAbandon(this.form).then(res => {
+                if (res.code === 200) {
+                  this.form.exitPsm = false
+                  this.$message.success('操作成功')
+                  this.resetFrom()
+                } else if (res.code === null) {
+                  this.$message.error(res.message)
+                }
+              })
+            }
+          })
+        })
+      })
+    },
     // 废弃原因匹配
     getDictValue(fqYy) {
       const item = this.pgxList.find(item => item.dictLabel === fqYy)
@@ -191,24 +262,40 @@ export default {
           this.form.exitPsm = true
           this.form.fq_yy = res.data.fq_yy
           this.form.pzl = res.data.pzl
+          this.form.fq_bz = res.data.fq_bz
+          this.form.fq_dd = res.data.fq_dd
+          this.form.fq_mcode = res.data.fq_mcode
+          this.form.fq_dbxi = res.data.fq_dbxi
         })
       }
     },
     resetQuery() {
-      this.form = {
-        exitPsm: false,
-        pn: '',
-        lot: '',
-        plocation: '工序网板库',
-        phd: '',
-        psm: '',
-        pzl: '',
-        prank: '',
-        flag: 1,
-        ptype: '',
-        pstatus: 0
-      }
-      sessionStorage.setItem('recycleform', JSON.stringify(this.form))
+      this.$confirm('是否确认重置?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(res => {
+        this.type = '2'
+        this.form = {
+          exitPsm: false,
+          pn: '',
+          lot: '',
+          plocation: '工序网板库',
+          phd: '',
+          psm: '',
+          pzl: '',
+          prank: '',
+          flag: 1,
+          ptype: '',
+          pstatus: 0,
+          fq_yy: null,
+          fq_bz: null,
+          fq_dd: null,
+          fq_mcode: null,
+          fq_dbxi: null
+        }
+        sessionStorage.setItem('recycleform', JSON.stringify(this.form))
+      })
     },
     // 回车跳转下一个输入框
     focusNextInput(form) {
@@ -234,8 +321,14 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(res => {
+        this.type = '1'
         this.$refs.form.validate((valid) => {
           if (valid) {
+            this.form.fq_yy = null
+            this.form.fq_bz = null
+            this.form.fq_dd = null
+            this.form.fq_mcode = null
+            this.form.fq_dbxi = null
             // 提价时要调的接口
             recycle(this.form).then(res => {
               if (res.code === 200) {
@@ -262,7 +355,12 @@ export default {
         prank: '',
         flag: 1,
         ptype: '',
-        pstatus: 0
+        pstatus: 0,
+        fq_yy: null,
+        fq_bz: null,
+        fq_dd: null,
+        fq_mcode: null,
+        fq_dbxi: null
       }
       // 重置表单校验
       this.$refs.form.clearValidate()