浏览代码

问题修改

jiangn 1 年之前
父节点
当前提交
96d7dcd77f
共有 4 个文件被更改,包括 9 次插入2 次删除
  1. 1 0
      src/locale/lang/zh-CN.js
  2. 1 0
      src/view/mst/customer/form.vue
  3. 6 1
      src/view/mst/goods/form.vue
  4. 1 1
      src/view/pur/pur-order/index.vue

+ 1 - 0
src/locale/lang/zh-CN.js

@@ -754,6 +754,7 @@ export const columns = {
   cpSize:'公司规模',
   shopSize:'门店规模',
   feedback:'沟通反馈',
+  contactPhones:'联系电话',
 }
 
 /**

+ 1 - 0
src/view/mst/customer/form.vue

@@ -109,6 +109,7 @@ export default {
         contactName: null,
         contactPhone: null,
         saleStatusName: null,
+        channelId:null,
         staffId:null,
         staffName:null,
         reportStaff: self.$store.state.user.id,

+ 6 - 1
src/view/mst/goods/form.vue

@@ -62,7 +62,7 @@
             <SelectPop v-model="formData.unitId" :multiple="false" :options="unitList"
                        @on-select-label="unitClear"
                        labelKey="unitName"
-                       valueKey="unitId">
+                       valueKey="unitId">formData.flgSubUnit
             </SelectPop>
           </DkFormItem>
           <!--是否开启辅助单位-->
@@ -489,6 +489,11 @@ export default {
     setValuesByEdit(data) {
       if (data) {
         this.formData = data;
+        if (this.formData.subUnitId) {
+          this.showSubUnit = true
+        } else {
+          this.showSubUnit = false
+        }
         if (this.formData.subUnitId && this.formData.conversionFactor && this.formData.unitId){
           //计算公式
           this.formData.calculationFormula = this.formData.conversionFactor + data.unitName + "=1" + data.subUnitName

+ 1 - 1
src/view/pur/pur-order/index.vue

@@ -73,7 +73,7 @@
             <!--采购折扣-->
             <DkTableColumn field="purDiscount" data-type="number"></DkTableColumn>
             <!--订单状态-->
-            <DkTableColumn field="purStatusName"></DkTableColumn>
+            <DkTableColumn field="purStatusName" :color-cards="['暂存','成交']"></DkTableColumn>
             <!--入库状态-->
             <DkTableColumn field="intoStatusName" :color-cards="['待入库','入库中','已入库']"></DkTableColumn>
             <!--入库中数量-->