浏览代码

Merge branch 'develop_yh52_1' of http://git.chelingzhu.com/jianguan-web/qpls-md-html into develop_yh50

lilei 4 月之前
父节点
当前提交
e0a1b237ed
共有 3 个文件被更改,包括 117 次插入119 次删除
  1. 1 1
      public/version.json
  2. 58 59
      src/views/salesManagement/salesQuery/list.vue
  3. 58 59
      src/views/salesManagement/salesQueryNew/list.vue

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
-  "version": 1738942779427
+  "version": 1738981951607
 }

+ 58 - 59
src/views/salesManagement/salesQuery/list.vue

@@ -193,65 +193,64 @@
         </template>
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
-          <a-button
-            size="small"
-            type="link"
-            class="button-primary"
-            :id="'salesManagementList-audit-'+record.salesBillNo"
-            v-if="record.billStatus == 'WAIT_AUDIT' && $hasPermissions('B_salesAudit')"
-            @click="handleEexamine(record)"
-          >审核</a-button>
-          <a-button
-            size="small"
-            type="link"
-            :id="'salesManagementList-sendOut-'+record.salesBillNo"
-            v-if="record.billStatus == 'WAIT_OUT_WAREHOUSE' && $hasPermissions('B_salesStockOut')"
-            class="button-primary"
-            @click="handleSend(record)"
-          >出库</a-button>
-          <a-button
-            size="small"
-            type="link"
-            :id="'salesManagementList-edit-'+record.salesBillNo"
-            class="button-primary"
-            v-if="(((record.sourceType == 'SATELLITE' || record.sourceType == 'SALES' || record.sourceType == 'TEMPORARY_DISPATCHING') && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'WAIT_SUBMIT' ||record.billStatus == 'AUDIT_REJECT'))||(record.sourceType === 'TRANSFER_ORDER'&&record.billStatus == 'WAIT_AUDIT')||(record.sourceType == 'XPRH_PURCHASE'&&record.billStatus == 'WAIT_AUDIT')) && $hasPermissions('B_salesEdit')"
-            @click="handleEdit(record)"
-          >
-            编辑
-          </a-button>
-          <a-button
-            size="small"
-            type="link"
-            :id="'salesManagementList-del-'+record.salesBillNo"
-            class="button-error"
-            v-if="((record.sourceType == 'SATELLITE' || record.sourceType == 'SALES' ) && record.billStatus != 'FINISH')||(record.sourceType == 'TEMPORARY_DISPATCHING'&&record.billStatus != 'FINISH'&&record.billStatus != 'WAIT_OUT_WAREHOUSE') && $hasPermissions('B_salesDel')"
-            @click="handleDel(record)"
-          >
-            删除
-          </a-button>
-          <a-button
-            size="small"
-            type="link"
-            :id="'salesManagementList-edit1-'+record.salesBillNo"
-            class="button-primary"
-            v-if="((record.sourceType == 'CHILD_PURCHASE'||record.sourceType == 'DEALER_PURCHASE') && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'SUPERIOR_CHANGE')) && $hasPermissions('B_salesEdit')"
-            @click="handleEdit(record)"
-          >
-            改单
-          </a-button>
-          <a-button
-            size="small"
-            type="link"
-            :id="'salesManagementList-cancel-'+record.salesBillNo"
-            class="button-error"
-            v-if="((record.sourceType == 'CHILD_PURCHASE'||record.sourceType == 'DEALER_PURCHASE'||record.sourceType =='XPRH_PURCHASE') && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'SUPERIOR_CHANGE')) && record.sourceType != 'TRANSFER_ORDER'&& $hasPermissions('B_salesDel')"
-            @click="handleDel(record, 'cancel')"
-          >
-            取消
-          </a-button>
-          <span v-if="!(record.billStatus == 'WAIT_AUDIT' && $hasPermissions('B_salesAudit')) && !(record.billStatus == 'WAIT_OUT_WAREHOUSE' && $hasPermissions('B_salesStockOut')) && !(((record.sourceType == 'SATELLITE' || record.sourceType == 'SALES' || record.sourceType == 'TEMPORARY_DISPATCHING') && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'WAIT_SUBMIT' ||record.billStatus == 'AUDIT_REJECT'))||(record.sourceType === 'TRANSFER_ORDER'&&record.billStatus == 'WAIT_AUDIT')||(record.sourceType == 'XPRH_PURCHASE'&&record.billStatus != 'AUDIT_REJECT')) && $hasPermissions('B_salesEdit') && !(((record.sourceType == 'SATELLITE' || record.sourceType == 'SALES' || record.sourceType == 'TEMPORARY_DISPATCHING') && record.billStatus != 'FINISH') && $hasPermissions('B_salesDel'))">
-            <span v-if="!(((record.sourceType == 'CHILD_PURCHASE'||record.sourceType == 'DEALER_PURCHASE') && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'SUPERIOR_CHANGE')) &&$hasPermissions('B_salesEdit')) && !(((record.sourceType == 'CHILD_PURCHASE'||record.sourceType == 'DEALER_PURCHASE') && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'SUPERIOR_CHANGE')) && $hasPermissions('B_salesDel'))">--</span>
-          </span>
+          <div>
+            <a-button
+              size="small"
+              type="link"
+              class="button-primary"
+              :id="'salesManagementList-audit-'+record.salesBillNo"
+              v-if="record.billStatus == 'WAIT_AUDIT' && $hasPermissions('B_salesAudit')"
+              @click="handleEexamine(record)"
+            >审核</a-button>
+            <a-button
+              size="small"
+              type="link"
+              :id="'salesManagementList-sendOut-'+record.salesBillNo"
+              v-if="record.billStatus == 'WAIT_OUT_WAREHOUSE' && $hasPermissions('B_salesStockOut')"
+              class="button-primary"
+              @click="handleSend(record)"
+            >出库</a-button>
+            <a-button
+              size="small"
+              type="link"
+              :id="'salesManagementList-edit-'+record.salesBillNo"
+              class="button-primary"
+              v-if="(((record.sourceType == 'SATELLITE' || record.sourceType == 'SALES' || record.sourceType == 'TEMPORARY_DISPATCHING') && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'WAIT_SUBMIT' ||record.billStatus == 'AUDIT_REJECT'))||(record.sourceType === 'TRANSFER_ORDER'&&record.billStatus == 'WAIT_AUDIT')||(record.sourceType == 'XPRH_PURCHASE'&&record.billStatus == 'WAIT_AUDIT')) && $hasPermissions('B_salesEdit')"
+              @click="handleEdit(record)"
+            >
+              编辑
+            </a-button>
+            <a-button
+              size="small"
+              type="link"
+              :id="'salesManagementList-del-'+record.salesBillNo"
+              class="button-error"
+              v-if="((record.sourceType == 'SATELLITE' || record.sourceType == 'SALES' ) && record.billStatus != 'FINISH')||(record.sourceType == 'TEMPORARY_DISPATCHING'&&record.billStatus != 'FINISH'&&record.billStatus != 'WAIT_OUT_WAREHOUSE') && $hasPermissions('B_salesDel')"
+              @click="handleDel(record)"
+            >
+              删除
+            </a-button>
+            <a-button
+              size="small"
+              type="link"
+              :id="'salesManagementList-edit1-'+record.salesBillNo"
+              class="button-primary"
+              v-if="((record.sourceType == 'CHILD_PURCHASE'||record.sourceType == 'DEALER_PURCHASE') && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'SUPERIOR_CHANGE')) && $hasPermissions('B_salesEdit')"
+              @click="handleEdit(record)"
+            >
+              改单
+            </a-button>
+            <a-button
+              size="small"
+              type="link"
+              :id="'salesManagementList-cancel-'+record.salesBillNo"
+              class="button-error"
+              v-if="((record.sourceType == 'CHILD_PURCHASE'||record.sourceType == 'DEALER_PURCHASE'||record.sourceType =='XPRH_PURCHASE') && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'SUPERIOR_CHANGE')) && record.sourceType != 'TRANSFER_ORDER'&& $hasPermissions('B_salesDel')"
+              @click="handleDel(record, 'cancel')"
+            >
+              取消
+            </a-button>
+          </div>
         </template>
       </s-table>
     </a-spin>

+ 58 - 59
src/views/salesManagement/salesQueryNew/list.vue

@@ -198,65 +198,64 @@
           <!-- sourceType SALES自建   CHILD_PURCHASE下级创建  DEALER_PURCHASE省仓订单  XPRH_PURCHASE货架促销  TEMPORARY_DISPATCHING数字货架 -->
           <!-- billStatus  WAIT_SUBMIT待提交   WAIT_AUDIT待审核    AUDIT_REJECT审核不通过  WAIT_OUT_WAREHOUSE待出库   FINISH已完结  SUPERIOR_CHANGE上级改单  CANCEL已取消 -->
           <template slot="action" slot-scope="text, record">
-            <a-button
-              :id="'salesManagementList-audit-'+record.id"
-              size="small"
-              type="link"
-              class="button-primary"
-              v-if="record.billStatus == 'WAIT_AUDIT' && $hasPermissions('B_salesAudit')"
-              @click="handleEexamine(record)"
-            >审核</a-button>
-            <a-button
-              :id="'salesManagementList-outStock-'+record.id"
-              size="small"
-              type="link"
-              v-if="record.billStatus == 'WAIT_OUT_WAREHOUSE' && $hasPermissions('B_salesStockOut')"
-              class="button-primary"
-              @click="handleSend(record)"
-            >出库</a-button>
-            <a-button
-              size="small"
-              type="link"
-              :id="'salesManagementList-edit-'+record.salesBillNo"
-              class="button-primary"
-              v-if="(((record.sourceType == 'SATELLITE' || record.sourceType == 'SALES' || record.sourceType == 'TEMPORARY_DISPATCHING') && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'WAIT_SUBMIT' ||record.billStatus == 'AUDIT_REJECT'))||(record.sourceType === 'TRANSFER_ORDER'&&record.billStatus == 'WAIT_AUDIT')||(record.sourceType == 'XPRH_PURCHASE'&&record.billStatus == 'WAIT_AUDIT')) && $hasPermissions('B_salesEdit')"
-              @click="handleEdit(record)"
-            >
-              编辑
-            </a-button>
-            <a-button
-              :id="'salesManagementList-del-'+record.id"
-              size="small"
-              type="link"
-              class="button-error"
-              v-if="((record.sourceType == 'SATELLITE' || record.sourceType == 'SALES' ) && record.billStatus != 'FINISH')||(record.sourceType == 'TEMPORARY_DISPATCHING'&&record.billStatus != 'FINISH'&&record.billStatus != 'WAIT_OUT_WAREHOUSE')&& $hasPermissions('B_salesDel')"
-              @click="handleDel(record)"
-            >
-              删除
-            </a-button>
-            <a-button
-              :id="'salesManagementList-editUp-'+record.id"
-              size="small"
-              type="link"
-              class="button-primary"
-              v-if="((record.sourceType == 'CHILD_PURCHASE'||record.sourceType == 'DEALER_PURCHASE') && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'SUPERIOR_CHANGE')) && $hasPermissions('B_salesEdit')"
-              @click="handleEdit(record)"
-            >
-              改单
-            </a-button>
-            <a-button
-              :id="'salesManagementList-cancel-'+record.id"
-              size="small"
-              type="link"
-              class="button-error"
-              v-if="((record.sourceType == 'CHILD_PURCHASE'||record.sourceType == 'DEALER_PURCHASE'||record.sourceType =='XPRH_PURCHASE') && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'SUPERIOR_CHANGE')) && record.sourceType != 'TRANSFER_ORDER'&& $hasPermissions('B_salesDel')"
-              @click="handleDel(record, 'cancel')"
-            >
-              取消
-            </a-button>
-            <span v-if="!(record.billStatus == 'WAIT_AUDIT' && $hasPermissions('B_salesAudit')) && !(record.billStatus == 'WAIT_OUT_WAREHOUSE' && $hasPermissions('B_salesStockOut')) && !(((record.sourceType == 'SATELLITE' || record.sourceType == 'SALES' || record.sourceType == 'TEMPORARY_DISPATCHING') && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'WAIT_SUBMIT' ||record.billStatus == 'AUDIT_REJECT'))||(record.sourceType === 'TRANSFER_ORDER'&&record.billStatus == 'WAIT_AUDIT')||(record.sourceType == 'XPRH_PURCHASE'&&record.billStatus != 'AUDIT_REJECT')) && $hasPermissions('B_salesEdit') && !(((record.sourceType == 'SATELLITE' || record.sourceType == 'SALES' || record.sourceType == 'TEMPORARY_DISPATCHING') && record.billStatus != 'FINISH') && $hasPermissions('B_salesDel'))">
-              <span v-if="!(((record.sourceType == 'CHILD_PURCHASE'||record.sourceType == 'DEALER_PURCHASE') && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'SUPERIOR_CHANGE')) &&$hasPermissions('B_salesEdit')) && !(((record.sourceType == 'CHILD_PURCHASE'||record.sourceType == 'DEALER_PURCHASE') && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'SUPERIOR_CHANGE')) && $hasPermissions('B_salesDel'))">--</span>
-            </span>
+            <div>
+              <a-button
+                :id="'salesManagementList-audit-'+record.id"
+                size="small"
+                type="link"
+                class="button-primary"
+                v-if="record.billStatus == 'WAIT_AUDIT' && $hasPermissions('B_salesAudit')"
+                @click="handleEexamine(record)"
+              >审核</a-button>
+              <a-button
+                :id="'salesManagementList-outStock-'+record.id"
+                size="small"
+                type="link"
+                v-if="record.billStatus == 'WAIT_OUT_WAREHOUSE' && $hasPermissions('B_salesStockOut')"
+                class="button-primary"
+                @click="handleSend(record)"
+              >出库</a-button>
+              <a-button
+                size="small"
+                type="link"
+                :id="'salesManagementList-edit-'+record.salesBillNo"
+                class="button-primary"
+                v-if="(((record.sourceType == 'SATELLITE' || record.sourceType == 'SALES' || record.sourceType == 'TEMPORARY_DISPATCHING') && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'WAIT_SUBMIT' ||record.billStatus == 'AUDIT_REJECT'))||(record.sourceType === 'TRANSFER_ORDER'&&record.billStatus == 'WAIT_AUDIT')||(record.sourceType == 'XPRH_PURCHASE'&&record.billStatus == 'WAIT_AUDIT')) && $hasPermissions('B_salesEdit')"
+                @click="handleEdit(record)"
+              >
+                编辑
+              </a-button>
+              <a-button
+                :id="'salesManagementList-del-'+record.id"
+                size="small"
+                type="link"
+                class="button-error"
+                v-if="((record.sourceType == 'SATELLITE' || record.sourceType == 'SALES' ) && record.billStatus != 'FINISH')||(record.sourceType == 'TEMPORARY_DISPATCHING'&&record.billStatus != 'FINISH'&&record.billStatus != 'WAIT_OUT_WAREHOUSE')&& $hasPermissions('B_salesDel')"
+                @click="handleDel(record)"
+              >
+                删除
+              </a-button>
+              <a-button
+                :id="'salesManagementList-editUp-'+record.id"
+                size="small"
+                type="link"
+                class="button-primary"
+                v-if="((record.sourceType == 'CHILD_PURCHASE'||record.sourceType == 'DEALER_PURCHASE') && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'SUPERIOR_CHANGE')) && $hasPermissions('B_salesEdit')"
+                @click="handleEdit(record)"
+              >
+                改单
+              </a-button>
+              <a-button
+                :id="'salesManagementList-cancel-'+record.id"
+                size="small"
+                type="link"
+                class="button-error"
+                v-if="((record.sourceType == 'CHILD_PURCHASE'||record.sourceType == 'DEALER_PURCHASE'||record.sourceType =='XPRH_PURCHASE') && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'SUPERIOR_CHANGE')) && record.sourceType != 'TRANSFER_ORDER'&& $hasPermissions('B_salesDel')"
+                @click="handleDel(record, 'cancel')"
+              >
+                取消
+              </a-button>
+            </div>
           </template>
         </s-table>
       </a-spin>