Merge branch 'develop' of http://172.16.29.40:8010/wms/wms4 into develop

肖超群
2 parents 9eb5943c f7ff26c9
Showing 3 changed files with 13 additions and 13 deletions
ant-design-vue-jeecg/src/views/system/receipt/ReceiptContainerHeaderList.vue
ant-design-vue-jeecg/src/views/system/receipt/ReceiptHeaderList.vue
ant-design-vue-jeecg/src/views/system/shipment/ShipmentContainerHeaderList.vue
@@ -420,7 +420,7 @@ export default {
       }
       var ids = "";
       for (var a = 0; a < this.selectedRowKeys.length; a++) {
-        if (this.selectionRows[a] != null && this.selectionRows[a].status == 0) {
+        if (this.selectedRowKeys[a] != null && typeof this.selectedRowKeys[a] == "number") {
           ids += this.selectedRowKeys[a] + ",";
         }
       }
@@ -67,7 +67,7 @@
               </a-select>
             </a-form-item>
           </a-col>
-          <template v-if="toggleSearchStatus">
+          <template v-show="toggleSearchStatus">
             <a-col :xl="12" :lg="14" :md="16" :sm="24">
               <a-form-item label="创建日期">
                 <j-date :show-date="true" date-format="YYYY-MM-DD" placeholder="请选择开始时间"
@@ -175,29 +175,29 @@
         </template>
         <span slot="action" slot-scope="text, record">
-          <a-popconfirm v-has="'receiptHeader:back'" v-if="record.lastStatus == 800" title="确定回传吗?" @confirm="() => hanleBack(record)">
+          <a-popconfirm v-has="'receiptHeader:back'" v-show="record.lastStatus == 800" title="确定回传吗?" @confirm="() => hanleBack(record)">
           	<a><a-button type="default">回传</a-button></a>
           </a-popconfirm>
-          <a-popconfirm v-has="'receiptHeader:crossDocking'" v-if="record.lastStatus == 0" title="确定越库吗?" @confirm="() => hanleCross(record)">
+          <a-popconfirm v-has="'receiptHeader:crossDocking'" v-show="record.lastStatus == 0" title="确定越库吗?" @confirm="() => hanleCross(record)">
           	<a><a-button type="primary">越库</a-button></a>
             <a-divider type="vertical"/>
           </a-popconfirm>
-          <a v-if="(record.lastStatus < 800 && record.firstStatus >= 15 && record.firstStatus != '20') || (flowOff == '0' && record.lastStatus < 800) " @click="receive(record)" v-has="'receiptHeader:receive'">
+          <a v-show="(record.lastStatus < 800 && record.firstStatus >= 15 && record.firstStatus != '20') || (flowOff == '0' && record.lastStatus < 800) " @click="receive(record)" v-has="'receiptHeader:receive'">
             <a-button type="primary">组盘</a-button>
           </a>
-          <a v-if="record.firstStatus == '0' && flowOff == '1'" @click="createAudit(record)"><a-button type="primary">提交审核</a-button><a-divider type="vertical"/></a>
-          <a v-if="record.nextAuditor == username && flowOff == '1'" @click="audit(record)"><a-button type="primary">审核</a-button><a-divider type="vertical"/></a>
-          <a v-if="record.lastStatus == 850" @click="viewReason(record)"><a-button type="danger">原因</a-button><a-divider type="vertical"/></a>
-          <a-dropdown v-if="(record.firstStatus > 0 && record.firstStatus <= 20 && flowOff=='1') || (record.firstStatus == 0 && record.lastStatus == 0 && record.referCode == null)">
+          <a v-show="record.firstStatus == '0' && flowOff == '1'" @click="createAudit(record)"><a-button type="primary">提交审核</a-button><a-divider type="vertical"/></a>
+          <a v-show="record.nextAuditor == username && flowOff == '1'" @click="audit(record)"><a-button type="primary">审核</a-button><a-divider type="vertical"/></a>
+          <a v-show="record.lastStatus == 850" @click="viewReason(record)"><a-button type="danger">原因</a-button><a-divider type="vertical"/></a>
+          <a-dropdown v-show="(record.firstStatus > 0 && record.firstStatus <= 20 && flowOff=='1') || (record.firstStatus == 0 && record.lastStatus == 0 && record.referCode == null)">
             <a class="ant-dropdown-link"><a-divider type="vertical"/>更多 <a-icon type="down"/></a>
             <a-menu slot="overlay">
-               <a-menu-item v-if="record.firstStatus > 0 && record.firstStatus <= 20 && flowOff=='1'">
+               <a-menu-item v-show="record.firstStatus > 0 && record.firstStatus <= 20 && flowOff=='1'">
                   <a @click="openProcess(record)" type="primary">审核进度</a>
                </a-menu-item>
-              <a-menu-item v-has="'receiptHeader:edit'" v-if="record.firstStatus == 0 && record.lastStatus == 0 && record.referCode == null">
+              <a-menu-item v-has="'receiptHeader:edit'" v-show="record.firstStatus == 0 && record.lastStatus == 0 && record.referCode == null">
                   <a @click="handleEdit(record)">编辑</a>
                </a-menu-item>
-              <a-menu-item v-has="'receiptHeader:delete'" v-if="record.firstStatus == 0 && record.lastStatus == 0 && record.referCode == null">
+              <a-menu-item v-has="'receiptHeader:delete'" v-show="record.firstStatus == 0 && record.lastStatus == 0 && record.referCode == null">
                 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
                   <a>删除</a>
                 </a-popconfirm>
@@ -423,7 +423,7 @@ export default {
       }
       var ids = ''
       for (var a = 0; a < this.selectedRowKeys.length; a++) {
-        if (this.selectionRows[a] != null && this.selectionRows[a].status == 0) {
+        if (this.selectedRowKeys[a] != null && typeof this.selectedRowKeys[a] == "number") {
           ids += this.selectedRowKeys[a] + ','
         }
       }