lilei před 5 dny
rodič
revize
4e4fc53567

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

@@ -133,7 +133,7 @@
               编辑
             </a-button>
             <a-button
-              v-if="record.status=='WAIT_SUBMIT'&&$hasPermissions('B_fc_del')"
+              v-if="(record.status=='WAIT_SUBMIT'||record.status=='AUDIT_REJECT')&&$hasPermissions('B_fc_del')"
               size="small"
               type="link"
               class="button-error"
@@ -157,7 +157,7 @@
               class="button-info"
               @click="againEdit(record)"
             >
-              再次编辑
+              复制
             </a-button>
             <a-button
               v-if="record.status=='AUDIT_PASS'&&$hasPermissions('B_editFcDetail')"

+ 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: undefined
     }
   },
   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 == 1 ? '1' : '0'
         } 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'">

+ 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'">