chenrui 1 vuosi sitten
vanhempi
commit
50459ad24a

+ 2 - 1
src/views/productManagement/productInfo/importGuideModal.vue

@@ -152,7 +152,8 @@ export default {
       }, 1000)
       const link = document.createElement('a')
       link.style.display = 'none'
-      link.href = 'https://jg-ocs.oss-cn-beijing.aliyuncs.com/templ/promo/productImport.xlsx?t=' + new Date().getTime()
+      // link.href = 'https://jg-ocs.oss-cn-beijing.aliyuncs.com/templ/promo/productImport.xlsx?t=' + new Date().getTime()
+      link.href = location.protocol + '//' + location.host + '/templ/产品批量导入模板.xlsx'
       link.setAttribute('download', '产品批量导入模板' + '.xlsx')
       document.body.appendChild(link)
       link.click()

+ 15 - 0
src/views/productManagement/productInfo/list.vue

@@ -53,6 +53,11 @@
                   <rangeDate ref="rangeDate" @change="dateChange" />
                 </a-form-model-item>
               </a-col>
+              <a-col :md="4" :sm="24">
+                <a-form-item label="停产状态">
+                  <v-select code="PRICING_STATUS" id="productInfoList-pricingState" v-model="queryParam.pricingState" allowClear placeholder="请选择停产状态"></v-select>
+                </a-form-item>
+              </a-col>
             </template>
             <a-col :md="7" :sm="24" style="margin-bottom: 10px;">
               <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="productInfoList-refresh">查询</a-button>
@@ -138,6 +143,15 @@
           <span v-if="record.productTypeName2 || record.productTypeName3">{{ record.productTypeName2 }} {{ record.productTypeName3 ? '>' : '' }} {{ record.productTypeName3 }}</span>
           <span v-else>--</span>
         </template>
+        <!-- 停产状态 -->
+        <template slot="status" slot-scope="text, record">
+          <a-switch
+            checkedChildren="启用"
+            unCheckedChildren="停产"
+            id="roleList-isEnable"
+            v-model="record.isEnable"
+            @change="changeFlagHandle(text, record)" />
+        </template>
         <!-- 产品图片 -->
         <template slot="imageUrl" slot-scope="text, record">
           <div v-if="record.productPicList && record.productPicList.length>0">
@@ -252,6 +266,7 @@ export default {
         { title: '最新定价时间', dataIndex: 'pricingTime', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品状态', dataIndex: 'stateDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '定价状态', dataIndex: 'pricingStateDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '停产状态', dataIndex: 'pricingStateDictValue', width: '6%', align: 'center', scopedSlots: { customRender: 'imageUrl' } },
         { title: '产品图片', scopedSlots: { customRender: 'imageUrl' }, width: '7%', align: 'center' },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
       ],