lilei 4 days ago
parent
commit
17c6443936

+ 1 - 20
src/views/numsGoodsShelves/shelfSet/set.vue

@@ -187,7 +187,7 @@
       :openModal="openModal"
       :openModal="openModal"
       :type="modalType"
       :type="modalType"
       :nowData="nowData"
       :nowData="nowData"
-      @ok="editHwOk"
+      @ok="$refs.table.refresh()"
       @close="handleCancel" />
       @close="handleCancel" />
     <!-- 编辑、新增货位 -->
     <!-- 编辑、新增货位 -->
     <addHwModal
     <addHwModal
@@ -422,25 +422,6 @@ export default {
         this.openHwModal = true
         this.openHwModal = true
       }
       }
     },
     },
-    editHwOk (data) {
-      if (data.shelfPlaceCode) {
-        const params = {
-          id: this.nowData.id,
-          shelfPlaceCode: data.shelfPlaceCode,
-          shelfSn: data.shelfSn
-        }
-        // 开始提交数据
-        this.spinning = true
-        addPlaceAndProduct(params).then(res => {
-          if (res.status == 200) {
-            this.$refs.table.refresh()
-          }
-          this.spinning = false
-        })
-      } else {
-        this.$refs.table.refresh()
-      }
-    },
     // 基本信息
     // 基本信息
     getDetail () {
     getDetail () {
       shelfDetail({ sn: this.$route.params.sn }).then(res => {
       shelfDetail({ sn: this.$route.params.sn }).then(res => {

+ 17 - 17
src/views/reportData/salesProfitReport/list.vue

@@ -3,7 +3,7 @@
     <a-card size="small" :bordered="false" class="table-page-search-wrapper">
     <a-card size="small" :bordered="false" class="table-page-search-wrapper">
       <!-- 搜索条件 -->
       <!-- 搜索条件 -->
       <a-form-model
       <a-form-model
-        id="salesReportList-form"
+        id="salesProfit-form"
         ref="ruleForm"
         ref="ruleForm"
         class="form-model-con"
         class="form-model-con"
         layout="inline"
         layout="inline"
@@ -14,17 +14,17 @@
         <a-row :gutter="15">
         <a-row :gutter="15">
           <a-col :md="6" :sm="24">
           <a-col :md="6" :sm="24">
             <a-form-model-item label="创建时间">
             <a-form-model-item label="创建时间">
-              <rangeDate id="salesReportList-creatDate" ref="creatDate" v-model="creatTime" @change="creatDateChange" />
+              <rangeDate id="salesProfit-creatDate" ref="creatDate" v-model="creatTime" @change="creatDateChange" />
             </a-form-model-item>
             </a-form-model-item>
           </a-col>
           </a-col>
           <a-col :md="6" :sm="24">
           <a-col :md="6" :sm="24">
             <a-form-model-item label="客户名称">
             <a-form-model-item label="客户名称">
-              <custList id="salesReportList-buyerName" ref="custSatelliteList" @change="custSatelliteChange"></custList>
+              <custList id="salesProfit-buyerName" ref="custSatelliteList" @change="custSatelliteChange"></custList>
             </a-form-model-item>
             </a-form-model-item>
           </a-col>
           </a-col>
           <a-col :md="6" :sm="24">
           <a-col :md="6" :sm="24">
             <a-form-item label="客户类型">
             <a-form-item label="客户类型">
-              <custType id="salesReportList-salesTargetType" v-model="queryParam.salesTargetType" allowClear placeholder="请选择客户类型"></custType>
+              <custType id="salesProfit-salesTargetType" v-model="queryParam.salesTargetType" allowClear placeholder="请选择客户类型"></custType>
             </a-form-item>
             </a-form-item>
           </a-col>
           </a-col>
           <template v-if="advanced">
           <template v-if="advanced">
@@ -32,7 +32,7 @@
               <a-form-model-item label="收款方式">
               <a-form-model-item label="收款方式">
                 <v-select
                 <v-select
                   code="SETTLE_STYLE"
                   code="SETTLE_STYLE"
-                  id="salesReportList-settleStyleSn"
+                  id="salesProfit-settleStyleSn"
                   v-model="queryParam.settleStyleSn"
                   v-model="queryParam.settleStyleSn"
                   allowClear
                   allowClear
                   placeholder="请选择收款方式"
                   placeholder="请选择收款方式"
@@ -41,27 +41,27 @@
             </a-col>
             </a-col>
             <a-col :md="6" :sm="24">
             <a-col :md="6" :sm="24">
               <a-form-model-item label="审核时间">
               <a-form-model-item label="审核时间">
-                <rangeDate id="salesReportList-rangeDate" ref="rangeDate" v-model="time" @change="dateChange" />
+                <rangeDate id="salesProfit-rangeDate" ref="rangeDate" v-model="time" @change="dateChange" />
               </a-form-model-item>
               </a-form-model-item>
             </a-col>
             </a-col>
             <a-col :md="6" :sm="24">
             <a-col :md="6" :sm="24">
               <a-form-model-item label="业务员">
               <a-form-model-item label="业务员">
-                <a-input id="salesReportList-manName" v-model.trim="queryParam.manName" allowClear placeholder="请输入业务员"/>
+                <a-input id="salesProfit-manName" v-model.trim="queryParam.manName" allowClear placeholder="请输入业务员"/>
               </a-form-model-item>
               </a-form-model-item>
             </a-col>
             </a-col>
             <a-col :md="6" :sm="24">
             <a-col :md="6" :sm="24">
               <a-form-model-item label="单号">
               <a-form-model-item label="单号">
-                <a-input id="salesReportList-billNo" v-model.trim="queryParam.billNo" allowClear placeholder="请输入单号"/>
+                <a-input id="salesProfit-billNo" v-model.trim="queryParam.billNo" allowClear placeholder="请输入单号"/>
               </a-form-model-item>
               </a-form-model-item>
             </a-col>
             </a-col>
             <a-col :md="6" :sm="24">
             <a-col :md="6" :sm="24">
               <a-form-item label="客户所在区">
               <a-form-item label="客户所在区">
-                <AreaList id="salesReportList-areaList" changeOnSelect ref="areaList" @change="areaChange"></AreaList>
+                <AreaList id="salesProfit-areaList" changeOnSelect ref="areaList" @change="areaChange"></AreaList>
               </a-form-item>
               </a-form-item>
             </a-col>
             </a-col>
             <a-col :md="6" :sm="24">
             <a-col :md="6" :sm="24">
               <a-form-item label="单据类型">
               <a-form-item label="单据类型">
-                <a-select id="salesReportList-billType" v-model="queryParam.billType" allowClear placeholder="请选择单据类型">
+                <a-select id="salesProfit-billType" v-model="queryParam.billType" allowClear placeholder="请选择单据类型">
                   <a-select-option value="SALES_BILL">销售</a-select-option>
                   <a-select-option value="SALES_BILL">销售</a-select-option>
                   <a-select-option value="SALES_RETURN">销售退货</a-select-option>
                   <a-select-option value="SALES_RETURN">销售退货</a-select-option>
                 </a-select>
                 </a-select>
@@ -69,7 +69,7 @@
             </a-col>
             </a-col>
             <a-col :md="6" :sm="24">
             <a-col :md="6" :sm="24">
               <a-form-model-item label="客户关系">
               <a-form-model-item label="客户关系">
-                <v-select code="CUSTOMER_RELATION_TYPE" id="salesReportList-customerRelationType" v-model="queryParam.customerRelationType" allowClear placeholder="请选择客户关系"></v-select>
+                <v-select code="CUSTOMER_RELATION_TYPE" id="salesProfit-customerRelationType" v-model="queryParam.customerRelationType" allowClear placeholder="请选择客户关系"></v-select>
               </a-form-model-item>
               </a-form-model-item>
             </a-col>
             </a-col>
             <a-col :md="6" :sm="24">
             <a-col :md="6" :sm="24">
@@ -77,7 +77,7 @@
                 <v-select
                 <v-select
                   v-model="queryParam.urgentBillStatus"
                   v-model="queryParam.urgentBillStatus"
                   ref="status"
                   ref="status"
-                  id="salesReportList-status"
+                  id="salesProfit-status"
                   code="URGENT_STATUS"
                   code="URGENT_STATUS"
                   placeholder="请选择急件状态"
                   placeholder="请选择急件状态"
                   allowClear></v-select>
                   allowClear></v-select>
@@ -85,18 +85,18 @@
             </a-col>
             </a-col>
           </template>
           </template>
           <a-col :md="6" :sm="24">
           <a-col :md="6" :sm="24">
-            <a-button type="primary" @click="handleSearch" :disabled="disabled" id="salesReportList-refresh">查询</a-button>
-            <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="salesReportList-reset">重置</a-button>
+            <a-button type="primary" @click="handleSearch" :disabled="disabled" id="salesProfit-refresh">查询</a-button>
+            <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="salesProfit-reset">重置</a-button>
             <a-button
             <a-button
               type="primary"
               type="primary"
               style="margin-left: 5px"
               style="margin-left: 5px"
               @click="handleExport"
               @click="handleExport"
               :disabled="disabled"
               :disabled="disabled"
               :loading="exportLoading"
               :loading="exportLoading"
-              v-if="$hasPermissions('B_salesReportExport')"
+              v-if="$hasPermissions('M_salesProfitExport')"
               class="button-warning"
               class="button-warning"
-              id="salesReportList-export-btn">导出</a-button>
-            <a @click="advanced=!advanced" style="margin-left: 5px" id="salesReportList-advanced">
+              id="salesProfit-export-btn">导出</a-button>
+            <a @click="advanced=!advanced" style="margin-left: 5px" id="salesProfit-advanced">
               {{ advanced ? '收起' : '展开' }}
               {{ advanced ? '收起' : '展开' }}
               <a-icon :type="advanced ? 'up' : 'down'"/>
               <a-icon :type="advanced ? 'up' : 'down'"/>
             </a>
             </a>