bug修改

jshERP-web/src/mixins/newTableMixin.js

@@ -61,7 +61,7 @@ export const newTableMixin = {
     getTaskkboxProps(record) {
       return {
         props: {
-          disabled: record.taskStatus !== 1 || record.taskStatus !== 4,
+          disabled: record.taskStatus !== 1 && record.taskStatus !== 4,
         },
       }
     },

jshERP-web/src/views/bill/modules/OtherInModal.vue

@@ -28,7 +28,7 @@
             <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="供应商">
               <a-select
                 placeholder="请选择供应商"
-                v-decorator="['organId']"
+                v-decorator="['organId', validatorRules.organId]"
                 :disabled="!rowCanEdit"
                 :dropdownMatchSelectWidth="false"
                 showSearch
@@ -342,6 +342,9 @@ export default {
       },
       confirmLoading: false,
       validatorRules: {
+        organId: {
+          rules: [{ required: true, message: '请选择供应商!' }],
+        },
         operTime: {
           rules: [{ required: true, message: '请输入单据日期!' }],
         },

jshERP-web/src/views/bill/modules/OtherOutModal.vue

@@ -28,7 +28,7 @@
             <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="客户">
               <a-select
                 placeholder="请选择客户"
-                v-decorator="['organId']"
+                v-decorator="['organId', validatorRules.organId]"
                 :disabled="!rowCanEdit"
                 :dropdownMatchSelectWidth="false"
                 showSearch
@@ -342,6 +342,9 @@ export default {
       },
       confirmLoading: false,
       validatorRules: {
+        organId: {
+          rules: [{ required: true, message: '请选择客户!' }],
+        },
         operTime: {
           rules: [{ required: true, message: '请输入单据日期!' }],
         },

jshERP-web/src/views/stock/CheckList.vue

@@ -11,9 +11,7 @@
           :deoptData="deoptData"
         ></filter-form>
         <div style="margin-bottom: 6px">
-          <a-button :disabled="!selectedRowKeys.length" type="primary" icon="plus" @click="onStartTask"
-            >开始盘点</a-button
-          >
+          <a-button :disabled="!selectedRowKeys.length" type="primary" @click="onStartTask">开始盘点</a-button>
 
           <!-- <a-popconfirm style="margin: 0 6px" title="确定取消选中的盘点任务吗?" @confirm="() => cancelTask()">
             <a-button :disabled="!selectedRowKeys.length">取消盘点</a-button>
@@ -220,11 +218,13 @@ export default {
     onStartTask() {
       const ids = this.selectedRowKeys
       const url = this.url.startTask + ids
+      // this.$refs.table.clearSelection()
+
       getAction(url)
         .then((res) => {
           this.$message.success('盘点成功')
           this.getList()
-          this.$refs.table.clearSelection()
+          this.selectedRowKeys = []
         })
         .catch((err) => {
           this.$message.error('盘点失败')

jshERP-web/src/views/stock/TaskList.vue

@@ -4,7 +4,8 @@
       <a-card :bordered="false">
         <!-- 查询区域 -->
         <filter-form
-          @search="getList"
+          @search="onSearch"
+          @reset="onReset"
           :queryParam="queryParam"
           :spinnerList="spinnerList"
           :deoptData="deoptData"
@@ -58,7 +59,7 @@
             <a :disabled="record.taskStatus !== 1" @click="addTask('edit', record)">编辑</a>
             <a-divider type="vertical" />
             <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-              <a :disabled="record.taskStatus !== 1 || record.taskStatus !== 4">删除</a>
+              <a :disabled="record.taskStatus !== 1 && record.taskStatus !== 4">删除</a>
             </a-popconfirm>
           </span>
         </a-table>

jshERP-web/src/views/stock/components/FilterForm.vue

@@ -3,24 +3,24 @@
     <!-- 搜索区域 -->
     <a-form layout="inline" :form="queryParam" ref="form" @keyup.enter.native="searchQuery">
       <a-row :gutter="24">
-        <a-col :md="6" :sm="24">
+        <a-col :md="5" :sm="24">
           <a-form-item label="盘点状态" :labelCol="labelCol" :wrapperCol="wrapperCol">
             <a-select placeholder="请选择供应商" showSearch :options="taskStatusList" v-model="queryParam.taskStatus">
             </a-select>
           </a-form-item>
         </a-col>
-        <a-col :md="6" :sm="24">
+        <a-col :md="5" :sm="24">
           <a-form-item label="盘点单号" :labelCol="labelCol" :wrapperCol="wrapperCol">
             <a-input placeholder="请输入条码、名称、助记码、规格、型号等信息" v-model="queryParam.number"></a-input>
           </a-form-item>
         </a-col>
-        <a-col :md="6" :sm="24">
+        <a-col :md="5" :sm="24">
           <a-form-item label="盘点仓库" :labelCol="labelCol" :wrapperCol="wrapperCol">
             <a-select placeholder="请选择盘点仓库" showSearch :options="deoptData" v-model="queryParam.depotId">
             </a-select>
           </a-form-item>
         </a-col>
-        <a-col :md="6" :sm="24">
+        <a-col :md="5" :sm="24">
           <a-form-item label="创建人" :labelCol="labelCol" :wrapperCol="wrapperCol">
             <a-select placeholder="请选择创建人" showSearch :options="spinnerList" v-model="queryParam.createBy">
             </a-select>