Bläddra i källkod

Merge branch 'develop_yh49_1' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_yh49_1

chenrui 7 månader sedan
förälder
incheckning
36a1b7436b

+ 3 - 3
src/views/easyPassManagement/homepageCarouselImg/detailModal.vue

@@ -38,10 +38,10 @@
             <img
               :src="form.imageUrl"
               alt="图片走丢了"
-              width="80"
-              height="80"
+              width="750px"
+              height="300px"
               style="margin-right:10px;object-fit: cover;"/>
-            <div class="upload-desc">说明:单张大小小于10Mb;建议尺寸:宽(420px)*高(230px)</div>
+            <div class="upload-desc">说明:单张大小小于10Mb;建议尺寸:宽(750px)*高(300px)</div>
           </a-form-model-item>
           <a-form-model-item label="内容类型" prop="contentType">
             {{ form.contentType==='IMAGE_CONTENT'?'图文展示':form.contentType==='VIDEO'?'视频展示':form.contentType==='LINK'?'跳转链接':'促销活动' }}

+ 1 - 1
src/views/easyPassManagement/promotionalActivities/addPromotionModal.vue

@@ -100,7 +100,7 @@
                   :maxNums="1"
                   @change="changeImage"
                   listType="picture-card"></Upload>
-                <div class="upload-desc">说明:单张大小小于10Mb;建议尺寸:宽(420px)*高(230px)</div>
+                <div class="upload-desc">说明:单张大小小于10Mb;建议尺寸:宽(750px)*高(300px)</div>
               </a-form-model-item>
             </a-col>
             <a-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">

+ 3 - 3
src/views/easyPassManagement/promotionalActivities/detailModal.vue

@@ -42,10 +42,10 @@
                 <img
                   :src="form.imageUrl"
                   alt="图片走丢了"
-                  width="80"
-                  height="80"
+                  width="750px"
+                  height="300px"
                   style="margin-right:10px;object-fit: cover;"/>
-                <div class="upload-desc">说明:单张大小小于10Mb;建议尺寸:宽(420px)*高(230px)</div>
+                <div class="upload-desc">说明:单张大小小于10Mb;建议尺寸:宽(750px)*高(300px)</div>
               </a-form-model-item>
             </a-col>
             <a-col :xs="24" :sm="24">

+ 19 - 3
src/views/salesManagement/salesQueryNew/comps/productList.vue

@@ -540,17 +540,33 @@ export default {
     // 批量取消出现产品
     handleBatchCancelActive () {
       const _this = this
-      if (!_this.rowSelectionInfo || (_this.rowSelectionInfo && _this.rowSelectionInfo.selectedRowKeys.length < 1)) {
+      const len = _this.rowSelectionInfo && _this.rowSelectionInfo.selectedRowKeys.length
+      if (!_this.rowSelectionInfo || (len < 1)) {
         _this.$message.warning('请先选择产品后再进行批量操作!')
         return
       }
       const obj = []
+      const gift = []
       _this.rowSelectionInfo && _this.rowSelectionInfo.selectedRows.map(item => {
-        obj.push(item.salesBillDetailSn)
+        // 赠品
+        if (item.promotionFlag == 'GIFT') {
+          gift.push(item.productCode)
+        } else {
+          obj.push(item.salesBillDetailSn)
+        }
       })
+      if (gift.length == len) {
+        this.$info({
+          title: '提示',
+          content: '所选全部为赠品,其不能转为正常产品!',
+          centered: true,
+          okText: '知道了'
+        })
+        return
+      }
       this.$confirm({
         title: '提示',
-        content: '已选产品' + obj.length + '项,确认要批量取消促销转为正常产品吗?',
+        content: '已选产品' + len + '项,' + (gift.length ? '其中包含赠品' + gift.join(',') + '(赠品不能转正常产品),确认要继续批量取消促销转为正常产品吗?' : '确认要批量取消促销转为正常产品吗?'),
         centered: true,
         onOk () {
           _this.spinning = true

+ 3 - 2
src/views/setting/dataValidManagement/list.vue

@@ -12,7 +12,7 @@
             </a-col>
             <a-col :md="4" :sm="24">
               <a-form-item label="校验结果">
-                <a-select clearable placeholder="请选择校验结果" id="erpMessageManagement-checkResult" v-model="queryParam.resultType">
+                <a-select clearable placeholder="请选择校验结果" id="erpMessageManagement-checkResult" allowClear v-model="queryParam.resultType">
                   <a-select-option value="right" id="erpMessageManagement-checkResult-success">
                     成功
                   </a-select-option>
@@ -76,8 +76,9 @@
               <a-button
                 size="small"
                 type="link"
-                class="button-info"
+                class="button-error"
                 @click="handleCli(record)"
+                v-if="record.resultType!='right'"
                 :id="'erpMessageManagement-handle-btn'+record.id">处理</a-button>
               <a-button
                 v-if="record.bizNo"