fix:状态、提示

jshERP-web/src/mixins/JEditableTableMixin.js

@@ -110,7 +110,7 @@ export const JEditableTableMixin = {
             this.confirmLoading = false
             this.close()
           } else {
-            this.$message.warning(res.data.message)
+            this.$message.warning(res.msg||res.data.message)
             this.confirmLoading = false
           }
         })

jshERP-web/src/views/bill/OtherInList.vue

@@ -96,9 +96,10 @@
                   <a-form-item label="单据状态" :labelCol="labelCol" :wrapperCol="wrapperCol">
                     <a-select placeholder="请选择单据状态" v-model="queryParam.status">
                       <a-select-option value="0">未审核</a-select-option>
-                      <a-select-option value="9" v-if="!checkFlag">审核中</a-select-option>
+                      <a-select-option value="9">审核中</a-select-option>
                       <a-select-option value="8">审核不通过</a-select-option>
                       <a-select-option value="1">已审核</a-select-option>
+                      <a-select-option value="2">完成入库</a-select-option>
                     </a-select>
                   </a-form-item>
                 </a-col>
@@ -184,6 +185,7 @@
               <a-tag v-if="status == '1'" color="green">已审核</a-tag>
               <a-tag v-if="status == '8'" color="red">审核不通过</a-tag>
               <a-tag v-if="status == '9'" color="orange">审核中</a-tag>
+              <a-tag v-if="status == '2'" color="green">完成入库</a-tag>
             </template>
           </a-table>
         </div>

jshERP-web/src/views/bill/OtherOutList.vue

@@ -96,9 +96,10 @@
                   <a-form-item label="单据状态" :labelCol="labelCol" :wrapperCol="wrapperCol">
                     <a-select placeholder="请选择单据状态" v-model="queryParam.status">
                       <a-select-option value="0">未审核</a-select-option>
-                      <a-select-option value="9" v-if="!checkFlag">审核中</a-select-option>
+                      <a-select-option value="9">审核中</a-select-option>
                       <a-select-option value="8">审核不通过</a-select-option>
                       <a-select-option value="1">已审核</a-select-option>
+                      <a-select-option value="2">完成出库</a-select-option>
                     </a-select>
                   </a-form-item>
                 </a-col>
@@ -184,6 +185,7 @@
               <a-tag v-if="status == '1'" color="green">已审核</a-tag>
               <a-tag v-if="status == '8'" color="red">审核不通过</a-tag>
               <a-tag v-if="status == '9'" color="orange">审核中</a-tag>
+              <a-tag v-if="status == '2'" color="orange">完成出库</a-tag>
             </template>
           </a-table>
         </div>

jshERP-web/src/views/bill/PurchaseInList.vue

@@ -118,7 +118,7 @@
                   <a-form-item label="单据状态" :labelCol="labelCol" :wrapperCol="wrapperCol">
                     <a-select placeholder="请选择单据状态" v-model="queryParam.status">
                       <a-select-option value="0">未审核</a-select-option>
-                      <a-select-option value="9" v-if="!checkFlag">审核中</a-select-option>
+                      <a-select-option value="9">审核中</a-select-option>
                       <a-select-option value="6">待复核</a-select-option>
                       <a-select-option value="7">复核驳回</a-select-option>
                       <a-select-option value="8">审核不通过</a-select-option>

jshERP-web/src/views/bill/PurchaseOrderList.vue

@@ -94,7 +94,7 @@
                       <a-select-option value="6">待复核</a-select-option>
                       <a-select-option value="7">复核驳回</a-select-option>
                       <a-select-option value="8">审核不通过</a-select-option>
-                      <a-select-option value="9" v-if="!checkFlag">审核中</a-select-option>
+                      <a-select-option value="9">审核中</a-select-option>
                     </a-select>
                   </a-form-item>
                 </a-col>

jshERP-web/src/views/bill/SaleOrderList.vue

@@ -78,7 +78,7 @@
                   <a-form-item label="单据状态" :labelCol="labelCol" :wrapperCol="wrapperCol">
                     <a-select placeholder="请选择单据状态" v-model="queryParam.status">
                       <a-select-option value="0">未审核</a-select-option>
-                      <a-select-option value="9" v-if="!checkFlag">审核中</a-select-option>
+                      <a-select-option value="9">审核中</a-select-option>
                       <a-select-option value="6">待复核</a-select-option>
                       <a-select-option value="7">复核驳回</a-select-option>
                       <a-select-option value="8">审核不通过</a-select-option>

jshERP-web/src/views/bill/SaleOutList.vue

@@ -119,7 +119,7 @@
                   <a-form-item label="单据状态" :labelCol="labelCol" :wrapperCol="wrapperCol">
                     <a-select placeholder="请选择单据状态" v-model="queryParam.status">
                       <a-select-option value="0">未审核</a-select-option>
-                      <a-select-option value="9" v-if="!checkFlag">审核中</a-select-option>
+                      <a-select-option value="9">审核中</a-select-option>
                       <a-select-option value="6">待复核</a-select-option>
                       <a-select-option value="7">复核驳回</a-select-option>
                       <a-select-option value="8">审核不通过</a-select-option>