Browse Source

Merge branch 'deploy' of http://git.chelingzhu.com/jianguan-web/qpls-md-html into deploy

lilei 4 years ago
parent
commit
b9c206e59e

+ 1 - 1
src/views/allocationManagement/storeTransferOut/list.vue

@@ -47,7 +47,7 @@
                   v-model="queryParam.settleState"
                   ref="settleState"
                   id="storeTransferOutList-settleState"
-                  code="FINANCIAL_STATUS"
+                  code="FINANCIAL_RECEIVE_STATUS"
                   placeholder="请选择财务状态"
                   allowClear
                 ></v-select>

+ 1 - 1
src/views/bulkManagement/bulkWarehousingOrder/list.vue

@@ -53,7 +53,7 @@
                   v-model="queryParam.settleState"
                   ref="settleState"
                   id="bulkWarehousingOrderList-settleState"
-                  code="FINANCIAL_STATUS"
+                  code=" FINANCIAL_PAY_STATUS"
                   placeholder="请选择财务状态"
                   allowClear
                 ></v-select>

+ 2 - 4
src/views/productManagement/productInfo/edit.vue

@@ -179,7 +179,6 @@ export default {
     },
     // 选择单位
     unitChange (a, b) {
-      console.log(a, b)
       this.form.unit = b.dispName
     },
     //  获取产品信息
@@ -200,7 +199,6 @@ export default {
     handleSubmit (e) {
       e.preventDefault()
       const _this = this
-      console.log('productTypeSn3', _this.form.productTypeSn3)
       if (!this.form.productTypeSn3) {
         this.$message.warning('产品分类未选到第三级,请修改后再提交!')
         return
@@ -244,7 +242,7 @@ export default {
     },
     //  产品品牌  列表
     getProductBrand (val) {
-      dealerProductBrandQuery({}).then(res => {
+      dealerProductBrandQuery({ 'sysFlag': '0' }).then(res => {
         if (res.status == 200) {
           this.productBrandList = res.data
           if (val) { //  需将新增加的品牌回填到产品品牌的地方,即不需要用户再选一下
@@ -256,7 +254,7 @@ export default {
     },
     //  产品分类  列表
     getProductType () {
-      dealerProductTypeList({}).then(res => {
+      dealerProductTypeList({ 'sysFlag': '0' }).then(res => {
         if (res.status == 200) {
           this.productTypeList = res.data
         } else {