shaogen1995 4 лет назад
Родитель
Сommit
d19dd4dd78

+ 1 - 1
src/views/holding/holding0.vue

@@ -270,7 +270,7 @@ export default {
     },
     // 点击删除
     removeH0 (id, status) {
-      this.$confirm('确定删除?', '提示', {
+      this.$confirm('确定删除?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'

+ 1 - 0
src/views/holding/holding0_DiaEdit.vue

@@ -491,6 +491,7 @@ export default {
     async detailsById (myId) {
       const res = await detailsById(myId)
       this.ruleForm = res.data
+      this.ruleForm.amount = '' + this.ruleForm.amount
       if (this.ruleForm.fileIds) this.temp = this.ruleForm.fileIds.split(',')
       // this.ruleForm.fileIds = ''
       // console.log(99999, res)

+ 2 - 2
src/views/holding/holding0_add.vue

@@ -238,7 +238,7 @@ export default {
     // 点击删除多个
     batchDel () {
       if (this.delIds.length === 0) return this.$message.warning('未选中')
-      this.$confirm('确定删除?', '提示', {
+      this.$confirm('确定删除?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
@@ -259,7 +259,7 @@ export default {
     },
     // 点击删除单个
     async deletes (id) {
-      this.$confirm('确定删除?', '提示', {
+      this.$confirm('确定删除?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'

+ 4 - 3
src/views/holding/holding3_DiaEdit.vue

@@ -320,8 +320,8 @@ import {
   getGoodsNumType,
   getGoodsType,
   detailsById,
-  getFileList,
-  deleteAffix
+  getFileList
+  // deleteAffix
 } from '@/apis/holding'
 export default {
   name: 'holding3_DiaEdit',
@@ -475,7 +475,7 @@ export default {
           // console.log(999, this.temp.join(','))
           this.ruleForm.fileIds = this.temp.join(',')
         }
-        deleteAffix(val.id)
+        // deleteAffix(val.id)
         this.$message({
           type: 'success',
           message: '删除成功!'
@@ -491,6 +491,7 @@ export default {
     async detailsById (myId) {
       const res = await detailsById(myId)
       this.ruleForm = res.data
+      this.ruleForm.amount = '' + this.ruleForm.amount
       if (this.ruleForm.fileIds) this.temp = this.ruleForm.fileIds.split(',')
       // console.log(99999, res)
     },

+ 9 - 3
src/views/holding/holding3_look.vue

@@ -162,7 +162,7 @@
             @click="begEdit"
             >申请编辑</el-button
           >
-          <el-button type="primary" size="small" @click="applyMove" v-if="myObj.storageId" v-show="userLimits.move"
+          <el-button type="primary" size="small" @click="applyMove" v-if="myObj.storageId&&myObj.status!=='已出库'" v-show="userLimits.move"
             >申请移库</el-button
           >
           <el-button size="small" @click="record">操作记录</el-button>
@@ -549,6 +549,7 @@ export default {
     },
     async moveOk () {
       if (this.tempIds === '') return this.$message.warning('还未选择移库位置!')
+      if (this.myObj.storageId === this.tempIds) return this.$message.warning('不能与之前入库位置相同!')
       const res = await applyMove(this.myObj.id, this.tempIds)
       if (res.code === 0) {
         this.moveDialog = false
@@ -567,8 +568,13 @@ export default {
         else if (v.moduleType === 'storageIn') v.tempType = '藏品入库'
         else if (v.moduleType === 'storageOut') v.tempType = '藏品出库'
         // else if (v.moduleType === 'collectOut') v.tempType = '征集品提用'
-        else if (v.moduleType === 'ledgerEdit') v.tempType = '藏品修改'
-        else if (v.moduleType === 'ledgerMove') v.tempType = '藏品移库'
+        else if (v.moduleType === 'ledgerEdit') {
+          v.tempType = '藏品修改'
+          v.moduleNum = '-'
+        } else if (v.moduleType === 'ledgerMove') {
+          v.tempType = '藏品移库'
+          v.moduleNum = '-'
+        }
         // else if (v.moduleType === 'collectEdit') v.tempType = '征集品修改'
       })
     },

+ 1 - 1
src/views/layout/index.vue

@@ -196,7 +196,7 @@ export default {
     },
     // 退出登录
     loginOut () {
-      this.$confirm('确定退出?', '提示', {
+      this.$confirm('确定退出?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'