瀏覽代碼

bug 修复

lilei 2 年之前
父節點
當前提交
214fe4dad7
共有 2 個文件被更改,包括 252 次插入251 次删除
  1. 1 1
      public/version.json
  2. 251 250
      src/views/salesManagement/salesQueryNew/edit.vue

+ 1 - 1
public/version.json

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

+ 251 - 250
src/views/salesManagement/salesQueryNew/edit.vue

@@ -1,164 +1,164 @@
 <template>
   <div v-if="showPage" class="jg-page-wrap salesEdit-news-wrap">
-      <a-page-header :ghost="false" :backIcon="false" class="header-bar">
-        <!-- 自定义的二级文字标题 -->
-        <template slot="subTitle">
-          <a class="billno" style="margin-right:15px;">单号:{{ detailData&&detailData.salesBillNo || '--' }}</a>
-          <a-tag color="green" v-if="detailData.billStatusDictValue">{{ detailData.billStatusDictValue }}</a-tag>
-          <a-tag color="orange" v-if="detailData.financialStatusDictValue">{{ detailData.financialStatusDictValue }}</a-tag>
-          <!-- <span style="margin-left:10px;color: #666;">客户名称:{{ detailData&&detailData.buyerNameCurrent?detailData.buyerName?detailData.buyerNameCurrent==detailData.buyerName?detailData.buyerNameCurrent:detailData.buyerNameCurrent+'('+detailData.buyerName+')':detailData.buyerNameCurrent:'--' }}</span> -->
-          <a-button
-            id="salesEdit-edit-btn"
-            type="link"
-            style="margin-left:10px" 
-            v-if="detailData&&detailData.salesTragetType != 'DEALER'"
-            size="small"
-            @click="handleEdit"
-            key="0"><a-icon type="edit" /> 编辑</a-button>
-            <a-button id="purchaseNewOrderEdit-back-btn" type="link" @click="handleBack" class="button-default"> <a-icon type="rollback" /> 返回列表</a-button>
-        </template>
-        <!-- 操作区,位于 title 行的行尾 -->
-        <template slot="extra" v-if="$hasPermissions('B_salesPrint')">
-          <div style="margin-top: 5px;">
-            <PrintPanel ref="printBox" :disabled="dataSource.length==0" @handlePrint="handlePrint">
-              <div style="padding:10px;" slot="extendCons">
-                <a-checkbox v-model="printAllName" :checked="printAllName" id="salesQuery-printAllName">打印完整产品名称</a-checkbox>
-                <a-checkbox v-model="printOrgCode" :checked="printOrgCode" id="salesQuery-printOrgCode">打印原厂编码</a-checkbox>
-              </div>
-            </PrintPanel>
-            <a-divider type="vertical" v-if="detailData&&detailData.totalCategory" />
-            <a-button type="link" v-if="detailData&&detailData.totalCategory" @click="showSearch=!showSearch" :class="showSearch?'button-error':'button-default'"> <a-icon type="search" /> 筛选</a-button>
-            <a-divider type="vertical" v-if="detailData&&detailData.totalCategory" />
-            <a-button v-if="detailData&&detailData.totalCategory" id="salesNewOrderEdit-add-btn" type="link" @click="openChooseProduct=true"><a-icon type="plus" />添加产品</a-button>
-            <a-divider type="vertical" v-if="detailData&&detailData.totalCategory" />
-            <a-dropdown v-model="showCell" v-if="$hasPermissions('M_ShowAllCost')&&detailData&&detailData.totalCategory">
-              <a-button type="link" class="button-default"> <a-icon type="setting" />  显示</a-button>
-              <a-menu slot="overlay">
-                <a-menu-item>
-                  <a-checkbox v-model="isCosts" id="salesQuery-edit-cost">成本价</a-checkbox>
-                </a-menu-item>
-              </a-menu>
-            </a-dropdown>
-            <a-divider type="vertical" v-if="$hasPermissions('M_ShowAllCost')"/>
-            <a-dropdown>
-              <a-menu slot="overlay" @click="handleActions">
-                <a-menu-item key="4">
-                  <a-icon type="import" />导入产品
-                </a-menu-item>
-                <a-menu-item key="3" v-if="shelfInfo&&shelfInfo.state=='ENABLE'">
-                  <a-icon type="hdd"/>货架产品
-                </a-menu-item>
-                <a-menu-item key="2">
-                  <a-icon type="close-square"/>清空列表
-                </a-menu-item>
-                <a-menu-item key="1">
-                  <a-icon type="rest" style="font-size: 14px;" />{{isOwerEdit?'删除急件':'删除缺货'}}
-                </a-menu-item>
-              </a-menu>
-              <a-button type="link" class="button-default"> <a-icon type="unordered-list" />  更多</a-button>
-            </a-dropdown> 
-          </div>
-        </template>
-      </a-page-header>
-       <!-- 已选产品 -->
-      <div class="choosedList-cont">
-        <div class="choosed-table" v-if="detailData&&detailData.totalCategory">
-          <!-- 搜索条件 -->
-          <div class="table-page-search-wrapper" style="margin-bottom:0;" v-if="showSearch">
-            <a-form-model :model="productForm" ref="ruleForm" layout="inline" @keyup.enter.native="$refs.table.refresh(true)" >
-              <a-row :gutter="10">
-                <a-col :md="5" :sm="24">
-                  <a-form-model-item label="产品编码">
-                    <a-input v-model.trim="productForm.productCode" allowClear placeholder="输入产品编码" />
-                  </a-form-model-item>
-                </a-col>
-                <a-col :md="5" :sm="24">
-                  <a-form-model-item label="产品名称">
-                    <a-input v-model.trim="productForm.productName" allowClear placeholder="输入产品名称" />
-                  </a-form-model-item>
-                </a-col>
-                <a-col :md="4" :sm="24" v-if="isOwerEdit">
-                  <a-form-item label="是否为急件">
-                    <a-select allowClear v-model="productForm.oosFlag" placeholder="请选择是否">
-                      <a-select-option value="1">
-                        是
-                      </a-select-option>
-                      <a-select-option value="0">
-                        否
-                      </a-select-option>
-                    </a-select>
-                  </a-form-item>
-                </a-col>
-                <a-col :md="4" :sm="24" v-else>
-                  <a-form-item label="是否为缺货">
-                    <a-select allowClear v-model="productForm.oosFlag" placeholder="请选择是否">
-                      <a-select-option value="1">
-                        是
-                      </a-select-option>
-                      <a-select-option value="0">
-                        否
-                      </a-select-option>
-                    </a-select>
-                  </a-form-item>
-                </a-col>
-                <a-col :md="4" :sm="24">
-                  <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="salesEdit-refresh">查询</a-button>
-                  <a-button style="margin-left: 5px" @click="resetForm" id="salesEdit-reset">重置</a-button>
-                </a-col>
-              </a-row>
-            </a-form-model>
-          </div>
-          <div class="discount-box">
-            
-          </div>
-          <!-- 已选配件列表 -->
-          <s-table
-            class="sTable"
-            ref="table"
-            size="small"
-            :rowKey="(record) => record.id"
-            :columns="columns"
-            :data="loadData"
-            :scroll="{ y: tableHeight }"
-            :defaultLoadData="false"
-            :pageSize="30"
-            bordered>
-            <div slot="costTitle">
-              <a-tooltip placement="top">
-                <template slot="title">
-                  系统中不同批次的产品,成本价可能不同,此值是按照实际出库批次的成本计算得到。
-                </template>
-                <span style="margin-right: 5px;">实际总成本</span> <a-icon type="question-circle" />
-              </a-tooltip>
+    <a-page-header :ghost="false" :backIcon="false" class="header-bar">
+      <!-- 自定义的二级文字标题 -->
+      <template slot="subTitle">
+        <a class="billno" style="margin-right:15px;">单号:{{ detailData&&detailData.salesBillNo || '--' }}</a>
+        <a-tag color="green" v-if="detailData.billStatusDictValue">{{ detailData.billStatusDictValue }}</a-tag>
+        <a-tag color="orange" v-if="detailData.financialStatusDictValue">{{ detailData.financialStatusDictValue }}</a-tag>
+        <!-- <span style="margin-left:10px;color: #666;">客户名称:{{ detailData&&detailData.buyerNameCurrent?detailData.buyerName?detailData.buyerNameCurrent==detailData.buyerName?detailData.buyerNameCurrent:detailData.buyerNameCurrent+'('+detailData.buyerName+')':detailData.buyerNameCurrent:'--' }}</span> -->
+        <a-button
+          id="salesEdit-edit-btn"
+          type="link"
+          style="margin-left:10px"
+          v-if="detailData&&detailData.salesTragetType != 'DEALER'"
+          size="small"
+          @click="handleEdit"
+          key="0"><a-icon type="edit" /> 编辑</a-button>
+        <a-button id="purchaseNewOrderEdit-back-btn" type="link" @click="handleBack" class="button-default"> <a-icon type="rollback" /> 返回列表</a-button>
+      </template>
+      <!-- 操作区,位于 title 行的行尾 -->
+      <template slot="extra" v-if="$hasPermissions('B_salesPrint')">
+        <div style="margin-top: 5px;">
+          <PrintPanel ref="printBox" :disabled="dataSource.length==0" @handlePrint="handlePrint">
+            <div style="padding:10px;" slot="extendCons">
+              <a-checkbox v-model="printAllName" :checked="printAllName" id="salesQuery-printAllName">打印完整产品名称</a-checkbox>
+              <a-checkbox v-model="printOrgCode" :checked="printOrgCode" id="salesQuery-printOrgCode">打印原厂编码</a-checkbox>
             </div>
-            <!-- 产品名称 -->
-            <template slot="productName" slot-scope="text, record">
-              <a-tag color="blue" v-if="record.shelfPlaceCode">{{ record.shelfPlaceCode }}</a-tag>
-              <span>{{ text }}</span>
-            </template>
-            <!-- 产品编码 -->
-            <template slot="productCode" slot-scope="text, record">
-              <div v-if="detailData">
-                <div v-if="isOwerEdit">
-                  <a-badge count="急" v-if="record.oosFlag == 1">
-                    <div style="padding-right: 15px;">{{ text }}</div>
-                  </a-badge>
-                  <span v-else>{{ text }}</span>
-                </div>
-                <div v-else>
-                  <a-badge count="急" v-if="isAudit&&record.oosFlag == 1">
-                    <div style="padding-right: 15px;">{{ text }}</div>
-                  </a-badge>
-                  <a-badge count="缺" v-else-if="!isAudit&&(!record.currentStockQty || record.currentStockQty < record.qty)">
-                    <div style="padding-right: 15px;">{{ text }}</div>
-                  </a-badge>
-                  <span v-else>{{ text }}</span>
-                </div>
+          </PrintPanel>
+          <a-divider type="vertical" v-if="detailData&&detailData.totalCategory" />
+          <a-button type="link" v-if="detailData&&detailData.totalCategory" @click="showSearch=!showSearch" :class="showSearch?'button-error':'button-default'"> <a-icon type="search" /> 筛选</a-button>
+          <a-divider type="vertical" v-if="detailData&&detailData.totalCategory" />
+          <a-button v-if="detailData&&detailData.totalCategory" id="salesNewOrderEdit-add-btn" type="link" @click="openChooseProduct=true"><a-icon type="plus" />添加产品</a-button>
+          <a-divider type="vertical" v-if="detailData&&detailData.totalCategory" />
+          <a-dropdown v-model="showCell" v-if="$hasPermissions('M_ShowAllCost')&&detailData&&detailData.totalCategory">
+            <a-button type="link" class="button-default"> <a-icon type="setting" />  显示</a-button>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a-checkbox v-model="isCosts" id="salesQuery-edit-cost">成本价</a-checkbox>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+          <a-divider type="vertical" v-if="$hasPermissions('M_ShowAllCost')"/>
+          <a-dropdown>
+            <a-menu slot="overlay" @click="handleActions">
+              <a-menu-item key="4">
+                <a-icon type="import" />导入产品
+              </a-menu-item>
+              <a-menu-item key="3" v-if="shelfInfo&&shelfInfo.state=='ENABLE'">
+                <a-icon type="hdd"/>货架产品
+              </a-menu-item>
+              <a-menu-item key="2">
+                <a-icon type="close-square"/>清空列表
+              </a-menu-item>
+              <a-menu-item key="1">
+                <a-icon type="rest" style="font-size: 14px;" />{{ isOwerEdit?'删除急件':'删除缺货' }}
+              </a-menu-item>
+            </a-menu>
+            <a-button type="link" class="button-default"> <a-icon type="unordered-list" />  更多</a-button>
+          </a-dropdown>
+        </div>
+      </template>
+    </a-page-header>
+    <!-- 已选产品 -->
+    <div class="choosedList-cont">
+      <div class="choosed-table" v-if="detailData&&detailData.totalCategory">
+        <!-- 搜索条件 -->
+        <div class="table-page-search-wrapper" style="margin-bottom:0;" v-if="showSearch">
+          <a-form-model :model="productForm" ref="ruleForm" layout="inline" @keyup.enter.native="$refs.table.refresh(true)" >
+            <a-row :gutter="10">
+              <a-col :md="5" :sm="24">
+                <a-form-model-item label="产品编码">
+                  <a-input v-model.trim="productForm.productCode" allowClear placeholder="输入产品编码" />
+                </a-form-model-item>
+              </a-col>
+              <a-col :md="5" :sm="24">
+                <a-form-model-item label="产品名称">
+                  <a-input v-model.trim="productForm.productName" allowClear placeholder="输入产品名称" />
+                </a-form-model-item>
+              </a-col>
+              <a-col :md="4" :sm="24" v-if="isOwerEdit">
+                <a-form-item label="是否为急件">
+                  <a-select allowClear v-model="productForm.oosFlag" placeholder="请选择是否">
+                    <a-select-option value="1">
+                      是
+                    </a-select-option>
+                    <a-select-option value="0">
+                      否
+                    </a-select-option>
+                  </a-select>
+                </a-form-item>
+              </a-col>
+              <a-col :md="4" :sm="24" v-else>
+                <a-form-item label="是否为缺货">
+                  <a-select allowClear v-model="productForm.oosFlag" placeholder="请选择是否">
+                    <a-select-option value="1">
+                      是
+                    </a-select-option>
+                    <a-select-option value="0">
+                      否
+                    </a-select-option>
+                  </a-select>
+                </a-form-item>
+              </a-col>
+              <a-col :md="4" :sm="24">
+                <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="salesEdit-refresh">查询</a-button>
+                <a-button style="margin-left: 5px" @click="resetForm" id="salesEdit-reset">重置</a-button>
+              </a-col>
+            </a-row>
+          </a-form-model>
+        </div>
+        <div class="discount-box">
+
+        </div>
+        <!-- 已选配件列表 -->
+        <s-table
+          class="sTable"
+          ref="table"
+          size="small"
+          :rowKey="(record) => record.id"
+          :columns="columns"
+          :data="loadData"
+          :scroll="{ y: tableHeight }"
+          :defaultLoadData="false"
+          :pageSize="30"
+          bordered>
+          <div slot="costTitle">
+            <a-tooltip placement="top">
+              <template slot="title">
+                系统中不同批次的产品,成本价可能不同,此值是按照实际出库批次的成本计算得到。
+              </template>
+              <span style="margin-right: 5px;">实际总成本</span> <a-icon type="question-circle" />
+            </a-tooltip>
+          </div>
+          <!-- 产品名称 -->
+          <template slot="productName" slot-scope="text, record">
+            <a-tag color="blue" v-if="record.shelfPlaceCode">{{ record.shelfPlaceCode }}</a-tag>
+            <span>{{ text }}</span>
+          </template>
+          <!-- 产品编码 -->
+          <template slot="productCode" slot-scope="text, record">
+            <div v-if="detailData">
+              <div v-if="isOwerEdit">
+                <a-badge count="急" v-if="record.oosFlag == 1">
+                  <div style="padding-right: 15px;">{{ text }}</div>
+                </a-badge>
+                <span v-else>{{ text }}</span>
               </div>
-            </template>
-            <!-- 售价 -->
-            <template slot="price" slot-scope="text, record">
-              <div style="display:flex;align-items: center;" :class="record.cost > record.price?'redBg-row':''">
+              <div v-else>
+                <a-badge count="急" v-if="isAudit&&record.oosFlag == 1">
+                  <div style="padding-right: 15px;">{{ text }}</div>
+                </a-badge>
+                <a-badge count="缺" v-else-if="!isAudit&&(!record.currentStockQty || record.currentStockQty < record.qty)">
+                  <div style="padding-right: 15px;">{{ text }}</div>
+                </a-badge>
+                <span v-else>{{ text }}</span>
+              </div>
+            </div>
+          </template>
+          <!-- 售价 -->
+          <template slot="price" slot-scope="text, record">
+            <div style="display:flex;align-items: center;" :class="record.cost > record.price?'redBg-row':''">
               <div v-if="record.cost > record.price">
                 <a-tooltip placement="top">
                   <template slot="title">
@@ -176,52 +176,52 @@
                 placeholder="请输入"
                 @blur="e => priceBlur(e.target.value, record)"
                 style="flex-grow: 1;margin-left: 3px;text-align: right;"
-                />
-              </div>
-            </template>
-            <!-- 销售数量 -->
-            <template slot="salesNums" slot-scope="text, record">
-              <a-input-number
-                id="salesEdit-salesNums"
-                size="small"
-                v-model="record.qty"
-                :precision="0"
-                :min="1"
-                :max="999999"
-                placeholder="请输入"
-                @blur="e => qtyBlur(e.target.value, record)"
-                style="width: 100%;" />
-            </template>
-            <!-- 操作 -->
-            <template slot="action" slot-scope="text, record">
-              <a-button size="small" v-if="record.oosFlag == 0" type="link" class="button-primary" @click="handleViewDetail(record)">出库明细</a-button>
-              <a-button
-                size="small"
-                type="link"
-                :loading="delLoading"
-                class="button-error"
-                @click="handleDel(record)"
-                id="productInfoList-Del">删除</a-button>
-            </template>
-          </s-table>
+              />
+            </div>
+          </template>
+          <!-- 销售数量 -->
+          <template slot="salesNums" slot-scope="text, record">
+            <a-input-number
+              id="salesEdit-salesNums"
+              size="small"
+              v-model="record.qty"
+              :precision="0"
+              :min="1"
+              :max="999999"
+              placeholder="请输入"
+              @blur="e => qtyBlur(e.target.value, record)"
+              style="width: 100%;" />
+          </template>
+          <!-- 操作 -->
+          <template slot="action" slot-scope="text, record">
+            <a-button size="small" v-if="record.oosFlag == 0" type="link" class="button-primary" @click="handleViewDetail(record)">出库明细</a-button>
+            <a-button
+              size="small"
+              type="link"
+              :loading="delLoading"
+              class="button-error"
+              @click="handleDel(record)"
+              id="productInfoList-Del">删除</a-button>
+          </template>
+        </s-table>
+      </div>
+      <div class="choosed-table" v-else>
+        <div v-if="!spinning&&detailData.totalCategory==0">
+          <a-empty
+            :image="simpleImage"
+            :image-style="{
+              height: '60px',
+            }"
+          >
+            <span slot="description"> 暂无产品 </span>
+            <a-button type="primary" class="button-error" @click="openChooseProduct=true"><a-icon type="plus" />立即添加产品</a-button>
+          </a-empty>
         </div>
-        <div class="choosed-table" v-else>
-          <div v-if="!spinning&&detailData.totalCategory==0">
-            <a-empty
-              :image="simpleImage"
-              :image-style="{
-                height: '60px',
-              }"
-            >
-              <span slot="description"> 暂无产品 </span>
-              <a-button type="primary" class="button-error" @click="openChooseProduct=true"><a-icon type="plus" />立即添加产品</a-button>
-            </a-empty>
-          </div>
-          <div style="text-align: center;padding: 30px 50px;" v-if="spinning">
-            <a-spin :spinning="spinning" tip="Loading..."></a-spin>
-          </div>
+        <div style="text-align: center;padding: 30px 50px;" v-if="spinning">
+          <a-spin :spinning="spinning" tip="Loading..."></a-spin>
         </div>
-      
+      </div>
+
       <!-- 底部栏 -->
       <div class="footer-bar" v-if="detailData&&detailData.totalCategory">
         <!-- 总计 -->
@@ -255,17 +255,17 @@
               折后合计:<strong>{{ detailData&&(detailData.discountedAmount || detailData.discountedAmount==0) ? toThousands(detailData.discountedAmount) : '--' }}</strong>
             </div>
           </div>
-      </div>
-      <div>
-        <a-dropdown>
-          <a-menu slot="overlay">
-            <a-menu-item key="1"> <a-checkbox :value="0" :checked="tbForm.indexOf('AUDIT')>=0" @change="(e)=>{tbFormChange(e,0)}" id="salesQuery-tbsh">同步审核</a-checkbox> </a-menu-item>
-            <a-menu-item key="2"> <a-checkbox :value="1" :checked="tbForm.indexOf('STOCK_OUT')>=0" @change="(e)=>{tbFormChange(e,1)}" id="salesQuery-tbck">同步出库</a-checkbox> </a-menu-item>
-            <a-menu-item key="3"> <a-checkbox :value="2" :checked="tbForm.indexOf('SETTLE')>=0" @change="(e)=>{tbFormChange(e,2)}" id="salesQuery-tbsk">同步收款</a-checkbox></a-menu-item>
-          </a-menu>
-          <a-button style="margin-left: 8px" size="large"> 选择同步操作 <a-icon type="down" /> </a-button>
-        </a-dropdown>
-      </div>
+        </div>
+        <div>
+          <a-dropdown>
+            <a-menu slot="overlay">
+              <a-menu-item key="1"> <a-checkbox :value="0" :checked="tbForm.indexOf('AUDIT')>=0" @change="(e)=>{tbFormChange(e,0)}" id="salesQuery-tbsh">同步审核</a-checkbox> </a-menu-item>
+              <a-menu-item key="2"> <a-checkbox :value="1" :checked="tbForm.indexOf('STOCK_OUT')>=0" @change="(e)=>{tbFormChange(e,1)}" id="salesQuery-tbck">同步出库</a-checkbox> </a-menu-item>
+              <a-menu-item key="3"> <a-checkbox :value="2" :checked="tbForm.indexOf('SETTLE')>=0" @change="(e)=>{tbFormChange(e,2)}" id="salesQuery-tbsk">同步收款</a-checkbox></a-menu-item>
+            </a-menu>
+            <a-button style="margin-left: 8px" size="large"> 选择同步操作 <a-icon type="down" /> </a-button>
+          </a-dropdown>
+        </div>
         <div>
           <a-button
             type="primary"
@@ -281,11 +281,11 @@
     <!-- 选择客户弹框 -->
     <choose-custom-modal ref="custModal" :show="openModal" @updateData="updateData" @cancel="openModal=false" />
     <!-- 导入产品 -->
-    <importGuideModal 
-    :openModal="openGuideModal" 
-    :params="{salesBillSn: $route.params.sn, salesBillNo:detailData?detailData.salesBillNo:''}" 
-    @close="openGuideModal=false" 
-    @ok="hanldeImprotOk"></importGuideModal>
+    <importGuideModal
+      :openModal="openGuideModal"
+      :params="{salesBillSn: $route.params.sn, salesBillNo:detailData?detailData.salesBillNo:''}"
+      @close="openGuideModal=false"
+      @ok="hanldeImprotOk"></importGuideModal>
     <!-- 收付款弹框 -->
     <settleModal ref="settleModal" @ok="settleAcountPay" :openModal="openSettleModal" @close="openSettleModal=false"></settleModal>
     <!-- 出库明细 -->
@@ -297,8 +297,8 @@
       ref="partQuery"
       :newLoading="isInster"
       :showModal="openChooseProduct"
-      :checkedList = "checkedProductList"
-      @viewRecord="hanldSalesRecord" 
+      :checkedList="checkedProductList"
+      @viewRecord="hanldSalesRecord"
       @close="openChooseProduct=false"
       @add="insterProduct"
     ></chooseProductModal>
@@ -306,7 +306,7 @@
     <chooseShelfProduct
       v-if="showShelfModal"
       ref="chooseShelfProduct"
-      @viewRecord="hanldSalesRecord" 
+      @viewRecord="hanldSalesRecord"
       @add="insterProduct"
       @plAdd="plInsterProduct"
       :baseData="shelfInfo"
@@ -345,7 +345,7 @@ export default {
       showPage: false,
       spinning: false,
       showSearch: false,
-      openChooseProduct:false,
+      openChooseProduct: false,
       orderId: null, // 销售单id
       salesBillSn: null, // 销售单sn
       disabled: false, //  查询、重置按钮是否可操作
@@ -374,7 +374,7 @@ export default {
         this.disabled = true
         this.spinning = true
         this.productForm.salesBillSn = this.$route.params.sn
-        this.getChoosedList({salesBillSn: this.$route.params.sn})
+        this.getChoosedList({ salesBillSn: this.$route.params.sn })
         return salesDetailList(Object.assign(parameter, this.productForm)).then(res => {
           let data
           if (res.status == 200) {
@@ -440,18 +440,18 @@ export default {
   },
   methods: {
     ...mapActions(['GetSettleAccountState']),
-    handleActions(e){
-      if(e.key == 4){
-        this.openGuideModal=true
+    handleActions (e) {
+      if (e.key == 4) {
+        this.openGuideModal = true
       }
-      if(e.key == 3){
-        this.showShelfModal=true
+      if (e.key == 3) {
+        this.showShelfModal = true
       }
-      if(e.key == 2){ // 清空列表
+      if (e.key == 2) { // 清空列表
         this.delSalerOrder()
       }
-      if(e.key == 1){ // 删除急件
-        this.delSalerOrder(this.isOwerEdit?1:2)
+      if (e.key == 1) { // 删除急件
+        this.delSalerOrder(this.isOwerEdit ? 1 : 2)
       }
     },
     // 打印预览/快捷打印
@@ -486,13 +486,13 @@ export default {
       this.$refs.custModal.editCust(this.detailData)
     },
     // 查看销售记录
-    hanldSalesRecord(row){
+    hanldSalesRecord (row) {
       console.log(row)
       this.openSalesRecordModal = true
       this.$refs.salseRecord.getDetail(this.detailData.buyerSn, row.productSn, row)
     },
     // 查询已选所以产品
-    getChoosedList(params){
+    getChoosedList (params) {
       this.isInster = true
       queryCheckedList(params).then(res => {
         this.checkedProductList = res.data || []
@@ -549,7 +549,7 @@ export default {
         qty: record.qty,
         price: record.price
       }).then(res => {
-        this.getOrderDetail(false,true)
+        this.getOrderDetail(false, true)
         if (res.status == 200) {
           this.$message.info(res.message)
         }
@@ -584,7 +584,7 @@ export default {
           qty: record.qty,
           price: record.price
         }).then(res => {
-          this.getOrderDetail(false,true)
+          this.getOrderDetail(false, true)
           if (res.status == 200) {
             this.$message.info(res.message)
             this.spinning = false
@@ -601,10 +601,10 @@ export default {
       this.productForm = {
         productName: '',
         productCode: '',
-        oosFlag:undefined,
+        oosFlag: undefined,
         orderBy: 'sales_bill_detail.CREATE_DATE desc'
       }
-      this.$nextTick(()=>{
+      this.$nextTick(() => {
         this.$refs.table.refresh()
       })
     },
@@ -614,7 +614,7 @@ export default {
     },
     // 打折
     salesDiscount () {
-      if(this.discountAmountBak == this.detailData.discountAmount){
+      if (this.discountAmountBak == this.detailData.discountAmount) {
         return false
       }
       this.spinning = true
@@ -635,16 +635,16 @@ export default {
       const _this = this
       this.$confirm({
         title: '提示',
-        content: !flag?'确认要清空已选产品列表吗?':(flag==1 ?'确认要删除所有急件吗?删除后不可恢复。':'确认要删除所有缺货吗?删除后不可恢复。'),
+        content: !flag ? '确认要清空已选产品列表吗?' : (flag == 1 ? '确认要删除所有急件吗?删除后不可恢复。' : '确认要删除所有缺货吗?删除后不可恢复。'),
         centered: true,
         closable: true,
         onOk () {
           _this.spinning = true
-          let params = { id: _this.orderId, oosFlag: flag==1 ? 1 : undefined, oosFlag: flag==2 ? 1 : undefined }
+          const params = { id: _this.orderId, oosFlag: flag == 1 ? 1 : undefined, qhFlag: flag == 2 ? 1 : undefined }
           salesDel(params).then(res => {
             if (res.status == 200) {
               _this.getOrderDetail(true)
-              if(!flag){
+              if (!flag) {
                 _this.dataSource = []
               }
               _this.$message.success(res.message)
@@ -660,7 +660,8 @@ export default {
       this.$refs.outInDetialModal.getData(row)
     },
     // 删除产品
-    handleDel (row) {row
+    handleDel (row) {
+      row
       const _this = this
       this.$confirm({
         title: '提示',
@@ -672,7 +673,7 @@ export default {
           _this.spinning = true
           salesDetailDel({ id: row.id }).then(res => {
             if (res.status == 200) {
-              _this.getOrderDetail(false,true)
+              _this.getOrderDetail(false, true)
             }
             _this.$message.info(res.message)
             _this.delLoading = false
@@ -784,7 +785,7 @@ export default {
       })
     },
     //  销售单详情
-    getOrderDetail (flag,resetTable) {
+    getOrderDetail (flag, resetTable) {
       const vm = this
       vm.spinning = true
       salesDetail({ id: vm.$route.params.id }).then(res => {
@@ -795,9 +796,9 @@ export default {
             const buyerSn = (vm.detailData && vm.detailData.buyerSn && vm.detailData.sourceType && vm.detailData.sourceType == 'PURCHASE') ? '' : vm.detailData.buyerSn
             const priceType = vm.$route.params.priceType
             vm.$refs.partQuery.pageInit(buyerSn, priceType, vm.salesBillSn)
-            if(vm.detailData.totalCategory){
+            if (vm.detailData.totalCategory) {
               vm.resetForm()
-            }else{
+            } else {
               vm.spinning = false
               vm.checkedProductList = []
             }
@@ -805,10 +806,10 @@ export default {
             if (vm.detailData && vm.detailData.buyerSn) {
               vm.getShelfQueryByCustomer()
             }
-          }else{
-            if(resetTable){
+          } else {
+            if (resetTable) {
               vm.$refs.table.refresh()
-            }else{
+            } else {
               vm.spinning = false
             }
           }
@@ -898,7 +899,7 @@ export default {
     printAllName (newValue, oldValue) {
       localStorage.setItem('printAllName-' + this.$store.state.user.info.orgId, newValue)
     },
-    showSearch(newValue, oldValue){
+    showSearch (newValue, oldValue) {
       this.setTableH()
     },
     '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
@@ -937,7 +938,7 @@ export default {
     position: relative;
     height: 100%;
     box-sizing: border-box;
-    
+
     .choosedList-cont{
       position: relative;
       background-color: #fff;