Parcourir la source

盘点核对编辑状态显示修改

15102826049 il y a 3 semaines
Parent
commit
f9800acf37

+ 1 - 2
jshERP-web/src/views/stock/CheckList.vue

@@ -47,8 +47,7 @@
           <span slot="action" slot-scope="text, record">
             <a @click="addTask('detail', record)">查看</a>
             <a-divider type="vertical" />
-            <a :disabled="record.taskStatus !== 1" @click="addTask('edit', record)">编辑</a>
-            <a-divider type="vertical" />
+            <a :disabled="record.taskStatus > 1" @click="addTask('edit', record)">编辑</a>
             <!-- <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
               <a :disabled="record.taskStatus !== 1 || record.taskStatus !== 4">删除</a>
             </a-popconfirm> -->

+ 19 - 17
jshERP-web/src/views/stock/components/checkModal.vue

@@ -113,7 +113,13 @@
           <a-input disabled v-model="editForm.batchNumber" placeholder="请输入"></a-input>
         </a-form-model-item>
         <a-form-model-item label="实际库存" :labelCol="{ span: 4 }" :wrapperCol="{ span: 14 }" prop="newInventory">
-          <a-input-number placeholder="请输入" v-model="editForm.newInventory" @change="handleChangeNewInventory" :min="0" style="width:100%" />
+          <a-input-number
+            placeholder="请输入"
+            v-model="editForm.newInventory"
+            @change="handleChangeNewInventory"
+            :min="0"
+            style="width: 100%"
+          />
         </a-form-model-item>
         <a-form-model-item label="实际仓位货架" :labelCol="{ span: 4 }" :wrapperCol="{ span: 14 }" prop="newPosition">
           <a-input v-model="editForm.newPosition" placeholder="请输入"></a-input>
@@ -123,14 +129,12 @@
             差异数量
             <span>
               <a-tooltip>
-                <template slot="title">
-                  盘盈是正数,盘亏是负数
-                </template>
+                <template slot="title"> 盘盈是正数,盘亏是负数 </template>
                 <a-icon type="question-circle" />
               </a-tooltip>
             </span>
           </template>
-          <span :class="editForm.differenceCount!==0?'red-num':''">{{editForm.differenceCount}}</span>
+          <span :class="editForm.differenceCount !== 0 ? 'red-num' : ''">{{ editForm.differenceCount }}</span>
         </a-form-model-item>
         <a-form-model-item label="差异原因" :labelCol="{ span: 4 }" :wrapperCol="{ span: 14 }" prop="differenceReason">
           <a-input v-model="editForm.differenceReason" placeholder="请输入"></a-input>
@@ -232,12 +236,12 @@ export default {
       },
       editForm: {},
       editVisible: false,
-      editFormRules:{
-        newInventory:[
+      editFormRules: {
+        newInventory: [
           { required: true, message: '请输入实际库存' },
-          { pattern: /^[0-9]*$/, message: '只能输入数字' }
-        ]
-      }
+          { pattern: /^[0-9]*$/, message: '只能输入数字' },
+        ],
+      },
     }
   },
   watch: {
@@ -266,10 +270,8 @@ export default {
   },
   computed: {
     isShowBtn() {
-      console.log('==================', this.form.taskStatus)
-
       if (this.openType === 'detail') return false
-      if (this.form.taskStatus !== 1) return false
+      if (this.form.taskStatus > 3) return false
 
       return true
     },
@@ -450,16 +452,16 @@ export default {
       }
     },
 
-    handleChangeNewInventory(val){
-      const inventory = this.editForm.inventory? Number(this.editForm.inventory):0
+    handleChangeNewInventory(val) {
+      const inventory = this.editForm.inventory ? Number(this.editForm.inventory) : 0
       this.editForm.differenceCount = val - inventory
-    }
+    },
   },
 }
 </script>
 
 <style>
-.red-num{
+.red-num {
   color: #f5222d;
 }
 </style>

+ 6 - 2
jshERP-web/src/views/stock/components/stockModal.vue

@@ -167,8 +167,12 @@ export default {
           }
           const url = this.openType === 'add' ? this.url.add : this.url.update
           postAction(url, params).then((res) => {
-            this.$message.success('操作成功')
-            this.handleCancel()
+            if (res.code === 200) {
+              this.$message.success('操作成功')
+              this.handleCancel()
+            } else {
+              this.$message.error(res.msg)
+            }
           })
         }
       })