chenrui před 4 roky
rodič
revize
5ee5fc0a41

+ 1 - 1
.env

@@ -4,6 +4,6 @@ VUE_APP_API_BASE_URL=https://it.zyucgj.com/zyit/
 VUE_APP_VERSION=V1.0.1
 VUE_APP_PRO_NAME=箭冠汽配连锁系统
 VUE_APP_LOGO=@/assets/logo.png
-VUE_APP_THEME_COLOR=#ff0000
+VUE_APP_THEME_COLOR=#ed1c24
 VUE_APP_COM_NAME=广州市箭冠网络科技有限公司
 VUE_APP_ICP=粤ICP备10216726号

+ 1 - 1
.env.development

@@ -4,6 +4,6 @@ VUE_APP_API_BASE_URL=/api
 VUE_APP_VERSION=V1.0.1
 VUE_APP_PRO_NAME=箭冠汽配连锁系统-dev
 VUE_APP_LOGO=@/assets/logo.png
-VUE_APP_THEME_COLOR=#ff0000
+VUE_APP_THEME_COLOR=#ed1c24
 VUE_APP_COM_NAME=广州市箭冠网络科技有限公司
 VUE_APP_ICP=粤ICP备10216726号

+ 1 - 1
.env.preview

@@ -4,6 +4,6 @@ VUE_APP_API_BASE_URL=http://it.test.zyucgj.com/zyit
 VUE_APP_VERSION=V1.0.1
 VUE_APP_PRO_NAME=箭冠汽配连锁系统-pre
 VUE_APP_LOGO=@/assets/logo.png
-VUE_APP_THEME_COLOR=#ff0000
+VUE_APP_THEME_COLOR=#ed1c24
 VUE_APP_COM_NAME=广州市箭冠网络科技有限公司
 VUE_APP_ICP=粤ICP备10216726号

+ 1 - 1
src/config/defaultSettings.js

@@ -14,7 +14,7 @@
  */
 
 export default {
-  primaryColor: '#ff0000', // primary color of ant design
+  primaryColor: '#ed1c24', // primary color of ant design
   navTheme: 'dark', // theme for nav menu
   layout: 'sidemenu', // nav menu position: sidemenu or topmenu
   contentWidth: 'Fluid', // layout of content: Fluid or Fixed, only works when layout is topmenu

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

@@ -353,7 +353,7 @@
       }
       .tag-txt{
         font-size: 12px;
-        color: #ff0000;
+        color: #ed1c24;
       }
       .edit-circle-btn{
         margin-left: 15px;

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

@@ -78,7 +78,7 @@
       bordered>
       <!-- 散件单号 -->
       <template slot="purchaseNo" slot-scope="text, record">
-        <span style="color: #ff0000;cursor: pointer;">{{record.purchaseNo}}</span>
+        <span style="color: #ed1c24;cursor: pointer;">{{record.purchaseNo}}</span>
       </template>
       <!-- 状态 -->
       <template slot="state" slot-scope="text, record">

+ 1 - 1
src/views/chainAllocation/chainTransferOut/edit.vue

@@ -352,7 +352,7 @@
       }
       .tag-txt{
         font-size: 12px;
-        color: #ff0000;
+        color: #ed1c24;
       }
       .edit-circle-btn{
         margin-left: 15px;

+ 1 - 1
src/views/inventoryManagement/inventoryQuery/warehouseDetail.vue

@@ -189,7 +189,7 @@ export default {
       color: #19be6b;
     }
     .red{
-      color: #ff0000;
+      color: #ed1c24;
     }
   }
 </style>

+ 1 - 1
src/views/inventoryManagement/inventoryWarning/list.vue

@@ -441,7 +441,7 @@ export default {
       color: #19be6b;
     }
     .red{
-      color: #ff0000;
+      color: #ed1c24;
     }
     .yellow{
       color: #ff9900;

+ 1 - 1
src/views/inventoryManagement/warehouseAllocation/edit.vue

@@ -364,7 +364,7 @@
       }
       .tag-txt{
         font-size: 12px;
-        color: #ff0000;
+        color: #ed1c24;
       }
       .edit-circle-btn{
         margin-left: 15px;

+ 40 - 89
src/views/productManagement/productInfo/edit.vue

@@ -49,36 +49,14 @@
           placeholder="请输入辅助单位(最多30个字符)"
           allowClear />
       </a-form-model-item>
-      <a-form-model-item label="产品品牌" prop="contactPhone">
-        <a-select placeholder="请选择" :disabled="isEdit" allowClear v-model="form.dataSourceNo" :showSearch="true" option-filter-prop="children" :filter-option="filterOption">
-        	<a-select-option v-for="item in brandData" :key="item.salesChannelNo" :value="item.salesChannelNo">{{ item.salesChannelName }}</a-select-option>
+      <a-form-model-item label="产品品牌" prop="productBrand">
+        <a-select placeholder="请输入名称或拼音查询,如果没有请点击 '+' 新增" :disabled="isEdit" allowClear v-model="form.productBrand" :showSearch="true" option-filter-prop="children" :filter-option="filterOption" style="width: 90%;">
+        	<a-select-option v-for="item in productBrandList" :key="item.id" :value="item.id">{{ item.productBrandName }}</a-select-option>
         </a-select>
+        <a-button @click="openModal=true" icon="plus" size="small" id="productInfoEdit-add-btn" style="margin-left: 5px;"></a-button>
       </a-form-model-item>
-      <a-form-model-item label="产品类别" required style="margin: 0;">
-        <a-row :gutter="15">
-          <!-- 产品类别 -->
-          <a-col span="8">
-            <a-form-model-item prop="provinceCode">
-              <a-select id="productInfoEdit-provinceCode" :disabled="isEdit" @change="getCityList" v-model="form.provinceCode" placeholder="一级分类">
-                <a-select-option v-for="item in addrProvinceList" :value="item.id" :key="item.id + 'a'">{{ item.name }}</a-select-option>
-              </a-select>
-            </a-form-model-item>
-          </a-col>
-          <a-col span="8">
-            <a-form-model-item prop="cityCode">
-              <a-select id="productInfoEdit-cityCode" :disabled="isEdit" @change="getAreaList" v-model="form.cityCode" placeholder="二级分类">
-                <a-select-option v-for="item in addrCityList" :value="item.id" :key="item.id + 'b'">{{ item.name }}</a-select-option>
-              </a-select>
-            </a-form-model-item>
-          </a-col>
-          <a-col span="8">
-            <a-form-model-item prop="districtCode">
-              <a-select id="productInfoEdit-districtCode" :disabled="isEdit" @change="areaCharged" v-model="form.districtCode" placeholder="三级分类">
-                <a-select-option v-for="item in addrDistrictList" :value="item.id" :key="item.id + 'c'">{{ item.name }}</a-select-option>
-              </a-select>
-            </a-form-model-item>
-          </a-col>
-        </a-row>
+      <a-form-model-item label="产品类别" prop="productType">
+        <a-cascader @change="changeProductType" :options="productTypeList" :fieldNames="{ label: 'productTypeName', value: 'id', children: 'children' }" id="productInfoEdit-productType" placeholder="请选择产品类别" allowClear v-model="form.productType" />
       </a-form-model-item>
       <a-form-model-item label="经销批发价" prop="name">
         <a-input-number
@@ -118,15 +96,20 @@
         <a-button @click="goBack" style="margin-left: 15px" id="productInfoEdit-btn-back">返回列表</a-button>
       </a-form-model-item>
     </a-form-model>
+    <!-- 新增/编辑产品品牌 -->
+    <product-brand-edit-modal :openModal="openModal" @ok="handleOk" @close="openModal=false" />
   </a-card>
 </template>
 
 <script>
 import { STable, VSelect } from '@/components'
+import productBrandEditModal from '../productBrand/editModal.vue'
+import { dealerProductBrandQuery } from '@/api/dealerProductBrand'
+import { dealerProductTypeQuery } from '@/api/dealerProductType'
 // import { goodsSave, goodsFind } from '@/api/goods'
 export default {
   name: 'productInfoEdit',
-  components: { STable, VSelect },
+  components: { STable, VSelect, productBrandEditModal },
   data () {
     return {
       formItemLayout: {
@@ -135,17 +118,7 @@ export default {
       },
       form: {
         name: '', // 供应商名称
-        provinceCode: undefined, //  省
-        provinceName: '',
-        cityCode: undefined, // 市
-        cityName: '',
-        districtCode: undefined, // 区
-        districtName: '',
-        address: '', //  详细地址
-        contactName: '',  //  联系人
-        contactPhone: '',  //  联系电话
-        remarks: '',  //  主营内容
-        state: 0  //  启禁用
+        productType: undefined, //  产品类别
       },
       rules: {
         name: [
@@ -176,7 +149,9 @@ export default {
       addrProvinceList: [], //  省下拉
       addrCityList: [], //  市下拉
       addrDistrictList: [], //  区下拉
-      brandData: [],  //  下拉数据
+      productBrandList: [],  //  品牌下拉数据
+      productTypeList: [],  //  类别下拉数据
+      openModal: false,  //  新增编辑  弹框
     }
   },
   computed: {
@@ -217,6 +192,14 @@ export default {
         }
       })
     },
+    changeProductType(val, opt){
+      console.log(val, opt)
+      console.log(this.form.productType)
+    },
+    //  新增品牌  成功
+    handleOk(){
+      //  获取品牌数据列表,并赋值
+    },
     filterOption(input, option) {
     	return (
     		option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
@@ -226,63 +209,31 @@ export default {
     goBack () {
       this.$router.push({ path: '/productManagement/productInfo/list' })
     },
-    // 获取省列表'
-    getProvinceList () {
-      getProvince().then(res => {
-        if (res.status == 200) {
-          this.addrProvinceList = res.data || []
-        } else {
-          this.addrProvinceList = []
+    //  产品品牌  列表
+    getProductBrand(){
+      dealerProductBrandQuery({}).then(res => {
+        if(res.status == 200){
+          this.productBrandList = res.data
+        }else{
+          this.productBrandList = []
         }
       })
     },
-    // 获取城市列表
-    getCityList (val) {
-      this.addrCityList = []
-      this.addrDistrictList = []
-      this.form.cityCode = undefined
-      this.form.districtCode = undefined
-      this.form.address = ''
-      this.getCityListRequest(val)
-    },
-    getCityListRequest (val) {
-      getCityByPro({
-        id: val
-      }).then(res => {
-        if (res.status == 200) {
-          this.addrCityList = res.data || []
-        } else {
-          this.addrCityList = []
+    //  产品类别  列表
+    getProductType(){
+      dealerProductTypeQuery({}).then(res => {
+        if(res.status == 200){
+          this.productTypeList = res.data
+        }else{
+          this.productTypeList = []
         }
       })
     },
-    // 获取区县列表
-    getAreaList (val) {
-      this.addrDistrictList = []
-      this.form.districtCode = undefined
-      this.form.address = ''
-      this.getAreaListRequest(val)
-    },
-    getAreaListRequest (val) {
-      getDistrictByCity({
-        id: val
-      }).then(res => {
-        if (res.status == 200) {
-          this.addrDistrictList = res.data || []
-        } else {
-          this.addrDistrictList = []
-        }
-      })
-    },
-    // 区县变更
-    areaCharged (val) {
-      this.form.address = ''
-    }
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {
-      // vm.getGoodsType()
-      // vm.getPartnerQueryList()
+      vm.getProductBrand()
+      vm.getProductType()
       vm.$refs.ruleForm.resetFields()
       if (vm.isEdit) { //  编辑页
         vm.getGoodsDetail()

+ 2 - 2
src/views/productManagement/productInfo/list.vue

@@ -84,7 +84,7 @@
       bordered>
       <!-- 产品编码 -->
       <template slot="productCode" slot-scope="text, record">
-        <a-badge count="箭是冠" :offset="[28,-10]" :number-style="{ backgroundColor: '#fff', color: '#ff0000', boxShadow: '0 0 0 1px #d9d9d9 inset', }" > {{record.productCode}} </a-badge>
+        <a-badge count="箭是冠" :offset="[28,-10]" :number-style="{ backgroundColor: '#fff', color: '#ed1c24', boxShadow: '0 0 0 1px #d9d9d9 inset', }" > {{record.productCode}} </a-badge>
       </template>
       <!-- 产品类别 -->
       <!-- 自定义表头 -->
@@ -93,7 +93,7 @@
           <template slot="title">
             <span>列表中只显示第三级分类的名称,鼠标移动至文字上,查看上级分类</span>
           </template>
-          产品类别<a-icon type="question-circle" :style="{ color: '#ff0000', marginLeft: '10px' }" />
+          产品类别<a-icon type="question-circle" :style="{ color: '#ed1c24', marginLeft: '10px' }" />
         </a-tooltip>
       </template>
       <template slot="productType" slot-scope="text, record">

+ 1 - 1
src/views/purchasingManagement/purchaseOrder/edit.vue

@@ -294,7 +294,7 @@
       }
       .tag-txt{
         font-size: 12px;
-        color: #ff0000;
+        color: #ed1c24;
       }
       .edit-circle-btn{
         margin-left: 15px;

+ 1 - 1
src/views/purchasingManagement/purchaseOrder/list.vue

@@ -77,7 +77,7 @@
       bordered>
       <!-- 采购单号 -->
       <template slot="purchaseNo" slot-scope="text, record">
-        <span style="color: #ff0000;cursor: pointer;">{{record.purchaseNo}}</span>
+        <span style="color: #ed1c24;cursor: pointer;">{{record.purchaseNo}}</span>
       </template>
       <!-- 状态 -->
       <template slot="state" slot-scope="text, record">

+ 2 - 2
src/views/purchasingManagement/purchaseOrder/receivingAddress/chooseAddressModal.vue

@@ -183,8 +183,8 @@
         padding: 0 7px;
         font-size: 12px;
         background-color: #fff;
-        color: #ff0000;
-        border-color: #ff0000;
+        color: #ed1c24;
+        border-color: #ed1c24;
         border-radius: 20px;
         box-shadow: 0 0 0 1px #d9d9d9 inset;
       }

+ 1 - 1
src/views/salesManagement/outboundOrder/list.vue

@@ -230,7 +230,7 @@ export default {
       }
     }
     .red{
-      color: #ff0000;
+      color: #ed1c24;
     }
     .green{
       color: #19be6b;

+ 1 - 1
src/views/salesManagement/urgentItemsOffset/detail.vue

@@ -167,7 +167,7 @@
         }
       }
       .red{
-        color: #ff0000;
+        color: #ed1c24;
       }
     }
   }

+ 1 - 1
src/views/salesManagement/urgentItemsOffset/list.vue

@@ -164,7 +164,7 @@ export default {
       }
     }
     .red{
-      color: #ff0000;
+      color: #ed1c24;
     }
     .green{
       color: #19be6b;

+ 4 - 4
src/views/user/Register.vue

@@ -115,8 +115,8 @@ const levelClass = {
   3: 'success'
 }
 const levelColor = {
-  0: '#ff0000',
-  1: '#ff0000',
+  0: '#ed1c24',
+  1: '#ed1c24',
   2: '#ff7e05',
   3: '#52c41a'
 }
@@ -135,7 +135,7 @@ export default {
         passwordLevel: 0,
         passwordLevelChecked: false,
         percent: 10,
-        progressColor: '#FF0000'
+        progressColor: '#ed1c24'
       },
       registerBtn: false
     }
@@ -277,7 +277,7 @@ export default {
   .user-register {
 
     &.error {
-      color: #ff0000;
+      color: #ed1c24;
     }
 
     &.warning {

+ 1 - 1
vue.config.js

@@ -108,7 +108,7 @@ const vueConfig = {
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        target: 'http://192.168.0.119:8503/qpls-md',
+        target: 'http://192.168.0.72:8503/qpls-md',
         // target: 'http://it.test.zyucgj.com/zyit',
         // target: 'https://it.test.qiubcar.com/zyit',
         ws: false,