Bläddra i källkod

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

lilei 1 år sedan
förälder
incheckning
43c259e7ca

+ 8 - 0
src/api/product.js

@@ -500,3 +500,11 @@ export const updateShowFlag = (params) => {
     method: 'post'
   })
 }
+// 修改停产状态
+export const updateHaltProdFlag = (params) => {
+  return axios({
+    url: '/product/updateHaltProdFlag',
+    data: params,
+    method: 'post'
+  })
+}

+ 29 - 7
src/views/productManagement/productInfo/list.vue

@@ -55,11 +55,18 @@
               </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-select v-model="queryParam.haltProdFlag" placeholder="请选择停产状态" allowClear>
+                    <a-select-option value="0">
+                      启用
+                    </a-select-option>
+                    <a-select-option value="1">
+                      停产
+                    </a-select-option>
+                  </a-select>
                 </a-form-item>
               </a-col>
             </template>
-            <a-col :md="7" :sm="24" style="margin-bottom: 10px;">
+            <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
               <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="productInfoList-refresh">查询</a-button>
               <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="productInfoList-reset">重置</a-button>
               <a-button
@@ -144,13 +151,13 @@
           <span v-else>--</span>
         </template>
         <!-- 停产状态 -->
-        <template slot="status" slot-scope="text, record">
+        <template slot="stopStatus" slot-scope="text, record">
           <a-switch
             checkedChildren="启用"
             unCheckedChildren="停产"
             id="roleList-isEnable"
-            v-model="record.isEnable"
-            @change="changeFlagHandle(text, record)" />
+            v-model="record.stopFlag"
+            @change="changeFlagHandle(record)" />
         </template>
         <!-- 产品图片 -->
         <template slot="imageUrl" slot-scope="text, record">
@@ -226,7 +233,7 @@ import productTypeAll from '@/views/common/productTypeAll.js'
 import { exportExcel } from '@/libs/JGPrint.js'
 import rangeDate from '@/views/common/rangeDate.vue'
 import importGuideModal from './importGuideModal.vue'
-import { productList, productAudit, productBatchAudit, productDel, productOnline, productBatchOnline, productExport, saveBatchImportProduct, importSaveBatch } from '@/api/product'
+import { productList, productAudit, productBatchAudit, productDel, productOnline, productBatchOnline, productExport, saveBatchImportProduct, importSaveBatch, updateHaltProdFlag } from '@/api/product'
 export default {
   name: 'ProductInfoList',
   mixins: [commonMixin],
@@ -237,6 +244,7 @@ export default {
       advanced: true, // 高级搜索 展开/关闭
       tableHeight: 0,
       queryParam: { //  查询条件
+        haltProdFlag: undefined, // 停产状态
         updateBeginDate: '',
         updateEndDate: '',
         name: '', //  产品名称
@@ -266,7 +274,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: '停产状态', width: '6%', align: 'center', scopedSlots: { customRender: 'stopStatus' } },
         { title: '产品图片', scopedSlots: { customRender: 'imageUrl' }, width: '7%', align: 'center' },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
       ],
@@ -284,6 +292,7 @@ export default {
             const no = (data.pageNo - 1) * data.pageSize
             for (var i = 0; i < data.list.length; i++) {
               data.list[i].no = no + i + 1
+              data.list[i].stopFlag = data.list[i].haltProdFlag == 0
             }
             this.disabled = false
           }
@@ -413,6 +422,18 @@ export default {
         })
       }
     },
+    // 改变停产状态
+    changeFlagHandle (row) {
+      const _this = this
+      _this.spinning = true
+      updateHaltProdFlag({ productSn: row.productSn, haltProdFlag: row.stopFlag ? 0 : 1 }).then(res => {
+        if (res.status == 200) {
+          _this.$message.success(res.message)
+          _this.$refs.table.refresh()
+        }
+        _this.spinning = false
+      })
+    },
     // 批量上线
     handleBatchLaunch () {
       const _this = this
@@ -485,6 +506,7 @@ export default {
       this.queryParam.state = undefined
       this.queryParam.pricingState = undefined
       this.queryParam.picFlag = undefined
+      this.queryParam.haltProdFlag = undefined
       this.productType = []
       if (this.advanced) {
         this.$refs.rangeDate.resetDate()

+ 15 - 1
src/views/salesManagement/shortageStatisticsP/list.vue

@@ -36,6 +36,18 @@
                   <v-select code="OOS_PRODUCT_STATE" id="shortageStatisticsPList-state" v-model="queryParam.state" allowClear placeholder="请选择产品状态"></v-select>
                 </a-form-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="停产状态">
+                  <a-select v-model="queryParam.haltProdFlag" placeholder="请选择停产状态" allowClear>
+                    <a-select-option value="0">
+                      启用
+                    </a-select-option>
+                    <a-select-option value="1">
+                      停产
+                    </a-select-option>
+                  </a-select>
+                </a-form-item>
+              </a-col>
             </template>
             <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
               <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="shortageStatisticsPList-refresh">查询</a-button>
@@ -120,7 +132,8 @@ export default {
         productCode: '',
         origCode: '',
         warehouseSn: undefined,
-        state: undefined
+        state: undefined,
+        haltProdFlag: undefined// 停产状态
       },
       disabled: false, //  查询、重置按钮是否可操作
       exportLoading: false, // 导出loading
@@ -253,6 +266,7 @@ export default {
       this.queryParam.origCode = ''
       this.queryParam.warehouseSn = undefined
       this.queryParam.state = undefined
+      this.queryParam.haltProdFlag = undefined
       this.$refs.table.refresh(true)
     },
     pageInit () {