Quellcode durchsuchen

Merge branch 'develop_yh68_2' of jianguan-web/jg-ocs-html into pre-release

李磊 vor 2 Tagen
Ursprung
Commit
0ddcb03e37

+ 10 - 10
src/views/financialManagement/financialCollection/list.vue

@@ -132,15 +132,6 @@
             >
               编辑
             </a-button>
-            <a-button
-              v-if="record.status=='WAIT_SUBMIT'&&$hasPermissions('B_fc_del')"
-              size="small"
-              type="link"
-              class="button-error"
-              @click="handleDel(record)"
-            >
-              删除
-            </a-button>
             <a-button
               v-if="record.status!='WAIT_SUBMIT'&&$hasPermissions('B_fc_Audit')"
               size="small"
@@ -157,7 +148,7 @@
               class="button-info"
               @click="againEdit(record)"
             >
-              再次编辑
+              复制
             </a-button>
             <a-button
               v-if="record.status=='AUDIT_PASS'&&$hasPermissions('B_editFcDetail')"
@@ -168,6 +159,15 @@
             >
               修改明细
             </a-button>
+            <a-button
+              v-if="(record.status=='WAIT_SUBMIT'||record.status=='AUDIT_REJECT')&&$hasPermissions('B_fc_del')"
+              size="small"
+              type="link"
+              class="button-error"
+              @click="handleDel(record)"
+            >
+              删除
+            </a-button>
           </template>
         </s-table>
       </a-spin>

+ 7 - 4
src/views/productManagement/priceChangeRecord/list.vue

@@ -22,8 +22,11 @@
             </a-col>
             <template v-if="advanced">
               <a-col :md="6" :sm="24">
-                <a-form-item label="变更状态">
-                  <v-select code="ENABLE_FLAG" id="productChangeRecordList-productStatus" v-model="queryParam.enabledFlag" allowClear placeholder="请选择变更状态"></v-select>
+                <a-form-item label="是否显示">
+                  <a-select id="productChangeRecordList-productStatus" v-model="queryParam.enabledFlag" allowClear 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="6" :sm="24">
@@ -79,7 +82,7 @@
           </template>
           <!-- 变更状态 -->
           <span slot="productStatus" slot-scope="text, record">
-            <a-switch checkedChildren="启用" :id="'productChangeRecordList-enabledFlag'+record.id" unCheckedChildren="禁用" v-model="record.enabledFlag" @change="changeFlagHandle(text, record)"/>
+            <a-switch checkedChildren="显示" :id="'productChangeRecordList-enabledFlag'+record.id" unCheckedChildren="不显示" v-model="record.enabledFlag" @change="changeFlagHandle(text, record)"/>
           </span>
           <!-- 省级价变更后 -->
           <template slot="afterProvincePrice" slot-scope="text, record">
@@ -189,7 +192,7 @@ export default {
         { title: '产品分类', scopedSlots: { customRender: 'productType' }, width: 120, align: 'left' },
         { title: '单位', dataIndex: 'productEntity.unit', width: 50, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '变更原因', dataIndex: 'changeReason', width: 70, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '变更状态', scopedSlots: { customRender: 'productStatus' }, width: 70, align: 'center' }
+        { title: '是否显示', scopedSlots: { customRender: 'productStatus' }, width: 70, align: 'center' }
       ]
       arr.push({
         title: '省级价',

+ 19 - 2
src/views/productManagement/productPricing/auditModal.vue

@@ -49,6 +49,16 @@
             </span>
           </a-descriptions-item>
           <a-descriptions-item label="变更原因">{{ detailsData && detailsData.changeReason || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="是否显示">
+            <a-radio-group v-model="priceShow">
+              <a-radio value="1">
+                显示
+              </a-radio>
+              <a-radio value="0">
+                不显示
+              </a-radio>
+            </a-radio-group>
+          </a-descriptions-item>
         </a-descriptions>
         <div class="btn-cont">
           <a-button type="primary" id="productPricingAudit-back" @click="handleAudit('AUDIT_REJECT')" style="margin-right: 15px;">审核不通过</a-button>
@@ -80,7 +90,8 @@ export default {
       spinning: false,
       toThousands, // 金额 截取到两位函数 3位添加‘,’
       isShow: this.openModal, //  是否打开弹框
-      detailsData: null //  详情数据
+      detailsData: null, //  详情数据
+      priceShow: '0'
     }
   },
   methods: {
@@ -89,6 +100,7 @@ export default {
       productPricingSnDetail({ sn: this.itemSn }).then(res => {
         if (res.status == 200) {
           this.detailsData = res.data
+          this.priceShow = this.detailsData.firstPriceFlag
         } else {
           this.detailsData = null
         }
@@ -96,10 +108,15 @@ export default {
     },
     // 审核  type =='AUDIT_REJECT'?'不通过':'通过(PRICED)'
     handleAudit (type) {
+      if (this.priceShow === undefined) {
+        this.$message.warning('请选择是否显示')
+        return
+      }
       const ajaxData = {
         id: this.detailsData.id,
         productSn: this.detailsData.productSn,
-        auditState: type
+        auditState: type,
+        enabledFlag: this.priceShow
       }
       this.spinning = true
       productPricingAudit(ajaxData).then(res => {

+ 1 - 1
src/views/promotionRulesManagement/dealerPromotions/specialOfferModal.vue

@@ -241,7 +241,7 @@
             </template>
           </a-table>
         </a-form-model-item>
-        <a-form-model-item label="规则叠加" prop="stackFlag" v-if="form.discountType!=0">
+        <a-form-model-item label="规则叠加" prop="stackFlag">
           <v-select
             style="width:40%;"
             size="small"

+ 1 - 0
src/views/salesManagement/pushOrderManagement/sendTypeModal.vue

@@ -45,6 +45,7 @@
             <a-radio value="2">包含</a-radio>
             <a-radio value="0">不包含</a-radio>
             <a-radio value="1">仅有</a-radio>
+            <a-radio value="3">分开打印</a-radio>
           </a-radio-group>
         </a-form-model-item>
         <a-form-model-item label="货位编号" prop="orderBy" v-if="nowType=='print'">

+ 3 - 3
src/views/salesManagement/salesQueryNew/comps/activeStatisticsList.vue

@@ -198,9 +198,9 @@ export default {
           align: 'center',
           fixed: 'left',
           renderBodyCell: ({ row, column, rowIndex }, h) => {
-            const isTejia = row && row.promotionRule && row.promotionRule.promotionRuleType == 'PROMO_PROD' && row.promotionRule.stackFlag == 1 && _this.type == 'edit' // 是否特价叠加
-            const tejiaLen = _this.tableData.filter(item => item.promotionRule && item.promotionRule.promotionRuleType == 'PROMO_PROD' && item.promotionRule.stackFlag == 1).length // 特价叠加活动数量
-            const tjStart = _this.tableData.findIndex(item => item.promotionRule && item.promotionRule.promotionRuleType == 'PROMO_PROD' && item.promotionRule.stackFlag == 1) // 特价叠加活动开始索引
+            const isTejia = row && row.promotionRule && row.promotionRule.promotionRuleType == 'PROMO_PROD' && row.promotionRule.stackFlag == 1 && row.promotionRule.discountType != '0' && _this.type == 'edit' // 是否特价叠加
+            const tejiaLen = _this.tableData.filter(item => item.promotionRule && item.promotionRule.promotionRuleType == 'PROMO_PROD' && item.promotionRule.stackFlag == 1 && item.promotionRule.discountType != '0').length // 特价叠加活动数量
+            const tjStart = _this.tableData.findIndex(item => item.promotionRule && item.promotionRule.promotionRuleType == 'PROMO_PROD' && item.promotionRule.stackFlag == 1 && item.promotionRule.discountType != '0') // 特价叠加活动开始索引
             // 特价活动上移下移排序
             const equalWord = <div class="table-arrow-box">
               {rowIndex > tjStart ? <span class="up" onClick={() => _this.moveTjRow(row, rowIndex, 1)} title="上移">⇡</span> : ''}

+ 8 - 1
src/views/salesManagement/salesQueryNew/comps/productActiveList.vue

@@ -85,6 +85,11 @@
                 <v-select code="FLAG" v-model="queryParam.borrowFlag" allowClear placeholder="请选择是否累计产品"></v-select>
               </a-form-item>
             </a-col>
+            <a-col flex="1">
+              <a-form-item label="是否缺货">
+                <v-select code="FLAG" v-model="queryParam.oosFlag" allowClear placeholder="请选择是否缺货"></v-select>
+              </a-form-item>
+            </a-col>
             <a-col flex="2" style="margin-bottom: 10px;">
               <a-button type="primary" @click="searchProduct" :disabled="disabled" :id="'salesEdit-refresh-'+id">查询</a-button>
               <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" :id="'salesEdit-reset-'+id">重置</a-button>
@@ -270,7 +275,8 @@ export default {
         promoProductClz: undefined, // 产品类型
         promoFlag: undefined,
         borrowFlag: undefined, // 是否累计
-        unitFlag: undefined // 是否满足起订量
+        unitFlag: undefined, // 是否满足起订量
+        oosFlag: undefined
       },
       productType: [], // 已选产品分类
       disableSelectedRowKeys: [], // 禁用的行
@@ -647,6 +653,7 @@ export default {
       this.queryParam.productTypeSn2 = ''
       this.queryParam.productTypeSn3 = ''
       this.queryParam.borrowFlag = undefined
+      this.queryParam.oosFlag = undefined
       this.queryParam.promoProductClz = undefined
       this.queryParam.unitFlag = undefined
       this.productType = []

+ 8 - 1
src/views/salesManagement/salesQueryNew/comps/productNormalList.vue

@@ -29,6 +29,11 @@
               <productTypeAll placeholder="请选择产品分类" @change="changeProductType" v-model="productType" id="salesEdit-productType"></productTypeAll>
             </a-form-item>
           </a-col>
+          <a-col flex="1">
+            <a-form-item label="是否缺货">
+              <v-select code="FLAG" v-model="queryParam.oosFlag" allowClear placeholder="请选择是否缺货"></v-select>
+            </a-form-item>
+          </a-col>
           <a-col flex="2" style="margin-bottom: 10px;">
             <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="salesEdit-refresh">查询</a-button>
             <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="salesEdit-reset">重置</a-button>
@@ -302,7 +307,8 @@ export default {
         productBrandSn: undefined, // 产品品牌
         productTypeSn1: '', //  产品一级分类
         productTypeSn2: '', //  产品二级分类
-        productTypeSn3: '' //  产品三级分类
+        productTypeSn3: '', //  产品三级分类
+        oosFlag: undefined
       },
       productType: [], // 产品分类
       rowSelectionInfo: null, // 已选的产品数据
@@ -590,6 +596,7 @@ export default {
       this.queryParam.productName = ''
       this.queryParam.warehouseSn = undefined
       this.queryParam.productBrandSn = undefined
+      this.queryParam.oosFlag = undefined
       this.queryParam.productTypeSn1 = ''
       this.queryParam.productTypeSn2 = ''
       this.queryParam.productTypeSn3 = ''

+ 2 - 1
src/views/salesManagement/salesQueryNew/edit.vue

@@ -197,6 +197,7 @@
     <!-- 提交时校验销售价低于成本价提示 -->
     <vaildPriceModal
       ref="vaildPriceModal"
+      type="edit"
       :openModal="openVaildPriceModal"
       :dataObj="tempData"
       @close="closeVaildPrice"
@@ -485,7 +486,7 @@ export default {
     },
     // 校验销售价低于成本价提示成功,关闭弹窗
     vaildPriceOk (type) {
-      if (type == 'AUDIT_UP_PASS') {
+      if (type == 'SUBMIT') {
         this.submitOrder()
       }
     },

+ 7 - 1
src/views/salesManagement/salesQueryNew/vaildPriceModal.vue

@@ -30,7 +30,9 @@
         </div>
         <div style="margin-top:36px;text-align:center;" v-if="modalType == 'price_less_cost'">
           <a-button @click="handleCancel" style="margin-right: 15px" id="chooseCustom-btn-back">取消</a-button>
-          <a-button type="primary" class="button-info" @click="handleSubmit('AUDIT_UP_PASS')" id="chooseCustom-btn-Pass">确定</a-button>
+          <a-button type="primary" v-if="type=='detail'" style="margin-right: 15px" @click="handleSubmit('AUDIT_REJECT')" id="chooseCustom-btn-noPasss">审核不通过</a-button>
+          <a-button type="primary" v-if="type=='detail'" class="button-info" @click="handleSubmit('AUDIT_UP_PASS')" id="chooseCustom-btn-Pass">审核通过</a-button>
+          <a-button type="primary" v-if="type=='edit'" class="button-info" @click="handleSubmit('SUBMIT')" id="chooseCustom-btn-Pass">确定</a-button>
         </div>
         <div style="margin-top:36px;text-align:center;" v-if="modalType == 'price_less_0'">
           <a-button @click="handleCancel" style="margin-right: 15px" id="chooseCustom-btn-back">关闭</a-button>
@@ -55,6 +57,10 @@ export default {
       default: () => {
         return null
       }
+    },
+    type: {
+      type: String,
+      default: 'detail'
     }
   },
   data () {

+ 1 - 0
src/views/salesManagement/stockPrint/sendTypeModal.vue

@@ -45,6 +45,7 @@
             <a-radio value="2">包含</a-radio>
             <a-radio value="0">不包含</a-radio>
             <a-radio value="1">仅有</a-radio>
+            <a-radio value="3">分开打印</a-radio>
           </a-radio-group>
         </a-form-model-item>
         <a-form-model-item label="货位编号" prop="orderBy" v-if="nowType=='print'">