Prechádzať zdrojové kódy

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

# Conflicts:
#	src/views/salesManagement/salesQueryNew/list.vue
lilei 2 rokov pred
rodič
commit
8d8c1835ef

+ 1 - 1
public/version.json

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

+ 15 - 10
src/views/allocationManagement/chainTransferIn/list.vue

@@ -11,22 +11,27 @@
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="调出对象">
-                <getTenantList id="chainTransferInList-outTenantSn" v-model="queryParam.outTenantSn"></getTenantList>
+              <a-form-item label="连锁调入单号">
+                <a-input id="warehousingAuditList-purchaseBillNo" v-model.trim="queryParam.purchaseBillNo" allowClear placeholder="请输入连锁调入单号"/>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="调拨产品类型">
-                <v-select
-                  v-model="queryParam.allocationType"
-                  ref="allocationType"
-                  id="chainTransferInList-allocationType"
-                  code="ALLOCATION_LINKAGE_PRODUCT_TYPE"
-                  placeholder="请选择调拨产品类型"
-                  allowClear></v-select>
+              <a-form-item label="调出对象">
+                <getTenantList id="chainTransferInList-outTenantSn" v-model="queryParam.outTenantSn"></getTenantList>
               </a-form-item>
             </a-col>
             <template v-if="advanced">
+              <a-col :md="6" :sm="24">
+                <a-form-item label="调拨产品类型">
+                  <v-select
+                    v-model="queryParam.allocationType"
+                    ref="allocationType"
+                    id="chainTransferInList-allocationType"
+                    code="ALLOCATION_LINKAGE_PRODUCT_TYPE"
+                    placeholder="请选择调拨产品类型"
+                    allowClear></v-select>
+                </a-form-item>
+              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="业务状态">
                   <v-select

+ 5 - 0
src/views/allocationManagement/chainTransferOut/list.vue

@@ -21,6 +21,11 @@
               </a-form-item>
             </a-col>
             <template v-if="advanced">
+              <a-col :md="6" :sm="24">
+                <a-form-item label="连锁调出单号">
+                  <a-input id="warehousingAuditList-purchaseBillNo" v-model.trim="queryParam.purchaseBillNo" allowClear placeholder="请输入连锁调出单号"/>
+                </a-form-item>
+              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="调往对象">
                   <getTenantList id="chainTransferOutList-putTenantSn" type="out" placeholder="请选择调往对象" v-model="queryParam.putTenantSn"></getTenantList>

+ 9 - 4
src/views/allocationManagement/storeTransferOut/list.vue

@@ -21,11 +21,16 @@
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="调往对象名称">
-                <custList id="storeTransferOutList-putPersonName" ref="custList" @change="custChange"></custList>
+              <a-form-item label="店内调出单号">
+                <a-input id="warehousingAuditList-purchaseBillNo" v-model.trim="queryParam.purchaseBillNo" allowClear placeholder="请输入店内调出单号"/>
               </a-form-item>
             </a-col>
             <template v-if="advanced">
+              <a-col :md="6" :sm="24">
+                <a-form-item label="调往对象名称">
+                  <custList id="storeTransferOutList-putPersonName" ref="custList" @change="custChange"></custList>
+                </a-form-item>
+              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="调拨类型">
                   <a-select id="storeTransferOutList-callOutType" v-model="queryParam.callOutType" placeholder="请选择调拨类型" allowClear >
@@ -223,7 +228,7 @@ export default {
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '创建时间', dataIndex: 'createDate', width: '11%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '店内调出单号', scopedSlots: { customRender: 'storeCallOutNo' }, width: '14%', align: 'center' },
-        { title: '调往对象名称', width: '16%', align: 'center', customRender: function (text, record) { return (record.putPersonType == 'CUSTOMER' ? record.customerNameCurrent: record.putPersonName) || '--' }, ellipsis: true },
+        { title: '调往对象名称', width: '16%', align: 'center', customRender: function (text, record) { return (record.putPersonType == 'CUSTOMER' ? record.customerNameCurrent : record.putPersonName) || '--' }, ellipsis: true },
         { title: '调拨类型', dataIndex: 'callOutTypeName', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '总款数', dataIndex: 'productTotalCategory', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '总数量', dataIndex: 'productTotalQty', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
@@ -298,7 +303,7 @@ export default {
       this.queryParam.callOutType = undefined
       this.queryParam.state = undefined
       this.queryParam.settleState = undefined
-      
+
       if (!flag) {
         this.setIsHomeNav(this.$route.name, null)
       }

+ 14 - 9
src/views/allocationManagement/warehouseAllocation/list.vue

@@ -10,22 +10,27 @@
                 <rangeDate ref="rangeDate" :value="time" @change="dateChange" />
               </a-form-item>
             </a-col>
-            <a-col :md="4" :sm="24">
-              <a-form-item label="调出仓库">
-                <a-select id="warehouseAllocation-basicInfo-outWarehouseSn" allowClear placeholder="请选择调出仓库" v-model="queryParam.outWarehouseSn">
-                  <a-select-option v-for="(item, index) in warehouseList" :key="index" :value="item.warehouseSn">{{ item.name }}</a-select-option>
-                </a-select>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="单号">
+                <a-input id="warehousingAuditList-purchaseBillNo" v-model.trim="queryParam.purchaseBillNo" allowClear placeholder="请输入单号"/>
               </a-form-item>
             </a-col>
-            <a-col :md="4" :sm="24">
-              <a-form-item label="调仓库">
-                <a-select id="warehouseAllocation-basicInfo-putWarehouseSn" allowClear placeholder="请选择调入仓库" v-model="queryParam.putWarehouseSn">
+            <a-col :md="6" :sm="24">
+              <a-form-item label="调仓库">
+                <a-select id="warehouseAllocation-basicInfo-outWarehouseSn" allowClear placeholder="请选择调出仓库" v-model="queryParam.outWarehouseSn">
                   <a-select-option v-for="(item, index) in warehouseList" :key="index" :value="item.warehouseSn">{{ item.name }}</a-select-option>
                 </a-select>
               </a-form-item>
             </a-col>
             <template v-if="advanced">
-              <a-col :md="4" :sm="24">
+              <a-col :md="6" :sm="24">
+                <a-form-item label="调入仓库">
+                  <a-select id="warehouseAllocation-basicInfo-putWarehouseSn" allowClear placeholder="请选择调入仓库" v-model="queryParam.putWarehouseSn">
+                    <a-select-option v-for="(item, index) in warehouseList" :key="index" :value="item.warehouseSn">{{ item.name }}</a-select-option>
+                  </a-select>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
                 <a-form-item label="业务状态">
                   <v-select
                     v-model="queryParam.state"

+ 35 - 2
src/views/bulkManagement/bulkReturnGoods/edit.vue

@@ -5,6 +5,9 @@
         <!-- 自定义的二级文字标题 -->
         <template slot="subTitle">
           <a id="bulkReturnGoodsEdit-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
+          <a-button type="link" style="margin-left: 20px;">
+            供应商:啦啦啦啦啦
+          </a-button>
         </template>
         <!-- 操作区,位于 title 行的行尾 -->
         <template slot="extra" v-if="$hasPermissions('B_sparePartsRetPrint')">
@@ -136,7 +139,14 @@
               </a-form>
             </div>
           </a-col>
-          <a-col :span="7" style="text-align: right;"></a-col>
+          <a-col :span="7" style="text-align: right;">
+            <a-button
+              class="button-error"
+              type="primary"
+              @click="bulkReturnGoodsDelAll"
+              :loading="delLoading"
+              ghost>清空列表 </a-button>
+          </a-col>
         </a-row>
         <!-- 列表 -->
         <s-table
@@ -289,7 +299,8 @@ export default {
       },
       localDataSource: [],
       productTotal: null, //  合计
-      warehouseList: [] // 仓库列表
+      warehouseList: [], // 仓库列表
+      delLoading: false
     }
   },
   methods: {
@@ -402,6 +413,28 @@ export default {
         }
       })
     },
+    // 清空列表
+    bulkReturnGoodsDelAll () {
+      const _this = this
+      this.$confirm({
+        title: '提示',
+        content: '确认要清空已选产品列表吗',
+        centered: true,
+        onOk () {
+          _this.spinning = true
+          sparePartsRetDetailDel({ }).then(res => {
+            if (res.status == 200) {
+              _this.$message.success(res.message)
+              _this.$refs.table.refresh()
+              _this.$refs.chooseTable.refresh()
+              _this.spinning = false
+            } else {
+              _this.spinning = false
+            }
+          })
+        }
+      })
+    },
     //  提交
     handleSubmit () {
       const _this = this

+ 35 - 2
src/views/bulkManagement/bulkReturnGoods/grabEdit.vue

@@ -5,6 +5,9 @@
         <!-- 自定义的二级文字标题 -->
         <template slot="subTitle">
           <a id="bulkReturnGoodsEdit-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
+          <a-button type="link" style="margin-left: 20px;">
+            供应商:啦啦啦啦啦
+          </a-button>
         </template>
         <!-- 操作区,位于 title 行的行尾 -->
         <template slot="extra" v-if="$hasPermissions('B_sparePartsRetPrint')">
@@ -119,7 +122,14 @@
               </a-form>
             </div>
           </a-col>
-          <a-col :span="7" style="text-align: right;"></a-col>
+          <a-col :span="7" style="text-align: right;">
+            <a-button
+              class="button-error"
+              type="primary"
+              @click="bulkReturnGoodsDelAll"
+              :loading="delLoading"
+              ghost>清空列表 </a-button>
+          </a-col>
         </a-row>
         <!-- 列表 -->
         <s-table
@@ -273,7 +283,8 @@ export default {
       },
       localDataSource: [],
       productTotal: null, //  合计
-      warehouseList: [] // 仓库列表
+      warehouseList: [], // 仓库列表
+      delLoading: false
     }
   },
   methods: {
@@ -387,6 +398,28 @@ export default {
         }
       })
     },
+    // 清空列表
+    bulkReturnGoodsDelAll () {
+      const _this = this
+      this.$confirm({
+        title: '提示',
+        content: '确认要清空已选产品列表吗',
+        centered: true,
+        onOk () {
+          _this.spinning = true
+          sparePartsRetDetailDel({ }).then(res => {
+            if (res.status == 200) {
+              _this.$message.success(res.message)
+              _this.$refs.table.refresh()
+              _this.$refs.chooseTable.refresh()
+              _this.spinning = false
+            } else {
+              _this.spinning = false
+            }
+          })
+        }
+      })
+    },
     //  提交
     handleSubmit () {
       const _this = this

+ 30 - 39
src/views/productManagement/productInfoJg/list.vue

@@ -51,7 +51,7 @@
     <!-- 操作按钮 -->
     <div class="table-operator" v-if="$hasPermissions('B_JgProduct_enable')">
       <a-row :gutter="16">
-        <a-col class="gutter-row" :span="12">
+        <a-col class="gutter-row" :span="8">
           <a-dropdown>
             <a-menu slot="overlay" @click="handleMenuClick">
               <a-menu-item key="1"> 批量启用</a-menu-item>
@@ -61,46 +61,37 @@
           </a-dropdown>
           <span v-if="rowSelectionInfo&&rowSelectionInfo.selectedRowKeys">已选 {{ rowSelectionInfo.selectedRowKeys.length }} 项</span>
         </a-col>
-        <a-col class="gutter-row" :span="12">
-          <div class="setTableList">
-            <a-checkbox v-model="isTerminalPrice">
-              自定义终端价
-            </a-checkbox>
-            <a-checkbox v-model="isCarOwnersPrice">
-              自定义车主价
-            </a-checkbox>
-          </div>
-          <!-- <div class="setTableList">
-            <span @click="iconShowFlag=!iconShowFlag">列表显示配置</span>
-            <a-icon :type="iconShowFlag?'up':'down'" :style="{ color: '#d5d5d5' }" @click="iconShowFlag=!iconShowFlag"/>
-            <div class="setTableList-box" v-show="iconShowFlag">
-              <a-checkbox-group @change="onChangeList" :value="chooseShowList">
-                <div>
-                  <a-checkbox value="A">
-                    省级价
+        <a-col class="gutter-row " :span="16" style="text-align: right;">
+          <a-popover trigger="hover" placement="bottom">
+            <template slot="content">
+              <div class="setTableList">
+                <p>
+                  <a-checkbox v-model="isTerminalPrice">
+                    自定义终端价
                   </a-checkbox>
-                </div>
-                <div><a-checkbox value="B">
-                  市级建议价
-                </a-checkbox></div>
-                <div><a-checkbox value="C">
-                  特约建议价
-                </a-checkbox></div>
-                <div><a-checkbox value="D">
-                  建议终端价
-                </a-checkbox></div>
-                <div> <a-checkbox value="E">
-                  建议车主价
-                </a-checkbox></div>
-                <div> <a-checkbox value="F">
-                  自定义终端价
-                </a-checkbox></div>
-                <div><a-checkbox value="G">
+                </p>
+                <a-checkbox v-model="isCarOwnersPrice">
                   自定义车主价
-                </a-checkbox></div>
-              </a-checkbox-group>
-            </div>
-          </div> -->
+                </a-checkbox>
+              </div>
+            </template>
+            <a-button type="link" class="button-default">
+              <a-icon type="setting" />
+              显示
+            </a-button>
+          </a-popover>
+          <a-divider type="vertical" style="margin:5px 0;"/>
+          <a-dropdown>
+            <a-menu slot="overlay" @click="handleActions">
+              <a-menu-item key="2">
+                <a-icon type="export" />自定义报价导出
+              </a-menu-item>
+              <a-menu-item key="1">
+                <a-icon type="import" />自定义报价导入
+              </a-menu-item>
+            </a-menu>
+            <a-button type="link" class="button-default"> <a-icon type="unordered-list" />  更多</a-button>
+          </a-dropdown>
         </a-col>
       </a-row>
     </div>

+ 2 - 1
src/views/reportData/bulkReturnReport/list.vue

@@ -141,11 +141,12 @@ export default {
         { title: '供应商', dataIndex: 'supplierName', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '款数', dataIndex: 'productTotalCategory', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '数量', dataIndex: 'productTotalQty', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '退货价', dataIndex: 'productTotalQty', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '成本', dataIndex: 'productTotalCost', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '审核时间', dataIndex: 'auditTime', width: '13%', align: 'center', customRender: function (text) { return text || '--' } }
       ]
       if (this.$hasPermissions('M_ShowAllCost')) {
-        arr.splice(5, 0, { title: '成本', dataIndex: 'productTotalCost', width: '7%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(6, 0, { title: '成本', dataIndex: 'productTotalCost', width: '7%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       return arr
     }

+ 1 - 0
src/views/salesManagement/salesQuery/list.vue

@@ -294,6 +294,7 @@ export default {
         { title: '总款数', dataIndex: 'totalCategory', align: 'center', width: '5%', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '总数量', dataIndex: 'totalQty', align: 'center', width: '5%', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '总售价', dataIndex: 'totalAmount', align: 'right', width: '5%', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '折扣金额', dataIndex: 'totalAmount', align: 'right', width: '5%', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '折后总售价', dataIndex: 'discountedAmount', align: 'right', width: '5%', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '收款方式', dataIndex: 'settleStyleSnDictValue', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '创建时间', dataIndex: 'createDate', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },

+ 123 - 0
src/views/salesManagement/salesQueryNew/list.vue

@@ -231,6 +231,129 @@
     <auditModal :openModal="visibleAudit" :spinning="spinningAudit" @close="visibleAudit=false" @ok="auditOrder('WAIT_OUT_WAREHOUSE')" @fail="auditOrder('AUDIT_REJECT')" />
   </a-card>
 </div>
+=======
+
+    <a-card size="small" :bordered="false">
+      <a-spin :spinning="spinning" tip="Loading...">
+        <!-- 操作按钮 -->
+        <div class="table-operator">
+          <a-button type="primary" class="button-error" v-if="$hasPermissions('B_salesNews')" @click="handleAdd(0)">新增(零售)</a-button>
+          <a-button type="primary" class="button-warning" v-if="$hasPermissions('B_salesNews')" @click="handleAdd(1)">新增(铺货)</a-button>
+          <a-checkbox style="margin-left:10px;" v-model="isByCustQuery" id="sales-byCustQuery">按客户查询</a-checkbox>
+          <a-popover placement="right">
+            <template slot="content">
+              使用此查询时,时间可清空,必须选择一个客户
+            </template>
+            <a-icon type="question-circle" />
+          </a-popover>
+
+        </div>
+        <a-alert type="info" style="margin-bottom:10px">
+          <div slot="message">
+            总售价:<strong>{{ totalData&&(totalData.totalAmount || totalData.totalAmount==0) ? toThousands(totalData.totalAmount) : '--' }}</strong>元;
+            总单数:<strong>{{ totalData&&(totalData.totalRecord || totalData.totalRecord==0) ? totalData.totalRecord : '--' }}</strong>;
+            总款数:<strong>{{ totalData&&(totalData.totalCategory || totalData.totalCategory==0) ? totalData.totalCategory : '--' }}</strong>;
+            总数量:<strong>{{ totalData&&(totalData.totalQty || totalData.totalQty==0) ? totalData.totalQty : '--' }}</strong>;
+          </div>
+        </a-alert>
+        <!-- 列表 -->
+        <s-table
+          class="sTable fixPagination"
+          ref="table"
+          :style="{ height: tableHeight+77+'px' }"
+          size="small"
+          :rowKey="(record) => record.id"
+          :columns="columns"
+          :data="loadData"
+          :scroll="{ y:tableHeight }"
+          :defaultLoadData="false"
+          bordered>
+          <!-- 销售单号 -->
+          <template slot="salesBillNo" slot-scope="text, record">
+            <span class="table-td-link" v-if="$hasPermissions('B_salesDetail')" @click="handleDetail(record)">{{ record.salesBillNo }}</span>
+            <span v-else>{{ record.salesBillNo }}</span>
+            <a-badge count="改" :offset="[10,0]" v-if="record.billStatus=='SUPERIOR_CHANGE'"></a-badge>
+          </template>
+          <!-- 审核 -->
+          <template slot="audit" slot-scope="text, record">
+            <stateIcon :title="record.billStatusDictValue" v-if="record.billStatus!='AUDIT_REJECT'" :state="record.billStatus == 'WAIT_OUT_WAREHOUSE'||record.billStatus == 'FINISH'?'1':'2'"></stateIcon>
+            <stateIcon :title="record.billStatusDictValue" v-else :state="0"></stateIcon>
+          </template>
+          <!-- 急件 -->
+          <template slot="oosFlag" slot-scope="text, record">
+            <stateIcon :state="record.oosFlag==1?'1':'2'"></stateIcon>
+          </template>
+          <!-- 出库 -->
+          <template slot="waitOut" slot-scope="text, record">
+            <stateIcon :state="record.billStatus == 'FINISH'?'1':'2'"></stateIcon>
+          </template>
+          <!-- 收款 -->
+          <template slot="financial" slot-scope="text, record">
+            <stateIcon :title="record.financialStatusDictValue" :state="record.financialStatus == 'FINISH'?'1':'2'"></stateIcon>
+          </template>
+          <!-- 操作 -->
+          <template slot="action" slot-scope="text, record">
+            <a-button
+              size="small"
+              type="link"
+              class="button-primary"
+              v-if="record.billStatus == 'WAIT_AUDIT' && $hasPermissions('B_salesAudit')"
+              @click="handleEexamine(record)"
+            >审核</a-button>
+            <a-button
+              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"
+              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')) && $hasPermissions('B_salesEdit')"
+              @click="handleEdit(record)"
+            >
+              编辑
+            </a-button>
+            <a-button
+              size="small"
+              type="link"
+              class="button-error"
+              v-if="((record.sourceType == 'SATELLITE' || record.sourceType == 'SALES' || record.sourceType == 'TEMPORARY_DISPATCHING') && record.billStatus != 'FINISH') && $hasPermissions('B_salesDel')"
+              @click="handleDel(record)"
+            >
+              删除
+            </a-button>
+            <a-button
+              size="small"
+              type="link"
+              class="button-primary"
+              v-if="(record.sourceType == 'PURCHASE' && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'SUPERIOR_CHANGE')) && $hasPermissions('B_salesEdit')"
+              @click="handleEdit(record)"
+            >
+              改单
+            </a-button>
+            <a-button
+              size="small"
+              type="link"
+              class="button-error"
+              v-if="(record.sourceType == 'PURCHASE' && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'SUPERIOR_CHANGE')) && $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')) && $hasPermissions('B_salesEdit')) && !(((record.sourceType == 'SATELLITE' || record.sourceType == 'SALES' || record.sourceType == 'TEMPORARY_DISPATCHING') && record.billStatus != 'FINISH') && $hasPermissions('B_salesDel')) && !((record.sourceType == 'PURCHASE' && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'SUPERIOR_CHANGE')) && $hasPermissions('B_salesEdit')) && !((record.sourceType == 'PURCHASE' && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'SUPERIOR_CHANGE')) && $hasPermissions('B_salesDel'))">--</span>
+          </template>
+        </s-table>
+      </a-spin>
+      <!-- 选择客户弹框 -->
+      <choose-custom-modal :show="openModal" :distributionFlag="distributionFlag" @ok="chooseCustomOk" @cancel="openModal=false"></choose-custom-modal>
+      <!-- 审核 -->
+      <auditModal :openModal="visibleAudit" :spinning="spinningAudit" @close="visibleAudit=false" @ok="auditOrder('WAIT_OUT_WAREHOUSE')" @fail="auditOrder('AUDIT_REJECT')" />
+    </a-card>
+  </div>
+>>>>>>> f38798f6f1455645ee8f60cd786bd551e3a2d404
 </template>
 
 <script>