浏览代码

Finish Hotfix-zh-108

howie 3 年之前
父节点
当前提交
07bea895eb

+ 1 - 0
src/store/getters.js

@@ -13,5 +13,6 @@ const getters = {
   customerNumber: (state) => state.user.customerNumber,
   showMessages: (state) => state.user.showMessages,
   code: (state) => state.sales.code,
+  isCustomer:state => state.user.customerId  && state.user.customerName &&  state.user.customerNumber
 };
 export default getters;

+ 6 - 6
src/views/basic_data/stock/product_list.vue

@@ -12,18 +12,18 @@
         <el-row :gutter="20">
 
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="产品编码" prop="materialNumber">
+            <el-form-item label="物料代码" prop="materialNumber">
               <el-input
                 v-model="screenForm.materialNumber"
-                placeholder="请输入产品编码"
+                placeholder="请输入物料代码"
               />
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="厂产品代码" prop="materialOldNumber">
+            <el-form-item label="产品编码" prop="materialOldNumber">
               <el-input
                 v-model="screenForm.materialOldNumber"
-                placeholder="请输入厂产品代码"
+                placeholder="请输入产品编码"
               />
             </el-form-item>
           </el-col>
@@ -96,7 +96,7 @@
           />
           <el-table-column
             align="left"
-            label="产品编码"
+            label="物料代码"
             prop="materialNumber"
             min-width="150"
             show-overflow-tooltip
@@ -108,7 +108,7 @@
           </el-table-column>
           <el-table-column
             align="left"
-            label="厂产品代码"
+            label="产品编码"
             prop="materialOldNumber"
             min-width="150"
             show-overflow-tooltip

+ 4 - 2
src/views/supply/deliver/sum_list.vue

@@ -68,8 +68,8 @@
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="发货单号" prop="mainOrderId">
-                <el-input v-model="screenForm.mainOrderId" placeholder="请输入发货单号"></el-input>
+              <el-form-item label="订单" prop="mainOrderId">
+                <el-input v-model="screenForm.mainOrderId" placeholder="请输入订单"></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
@@ -171,6 +171,7 @@
                 <span>{{scope.row.specification}}</span>
               </template>
             </el-table-column>
+               <el-table-column align="left" label="仓库" prop="stockName" min-width="100" show-overflow-tooltip></el-table-column>
 
             <el-table-column align="right" label="发货金额" prop="payAmount" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
@@ -202,6 +203,7 @@
                 {{scope.row.payAmount | numToFixed}}
               </template>
             </el-table-column>
+
             <el-table-column align="right" label="发货数量" prop="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="业务员" prop="serviceName" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="政策单号" prop="policyCode" min-width="100" show-overflow-tooltip></el-table-column>

+ 4 - 1
src/views/supply/engin/commerce_list.vue

@@ -305,7 +305,7 @@ import CommerceForm from "@/views/supply/engin/components/commerce_form";
 import CommerceExamine from "@/views/supply/engin/components/commerce_examine";
 import CommerceReturn from "@/views/supply/engin/components/commerce_return";
 import EditDateDialog from "@/components/Common/edit-date-dialog";
-
+import {mapGetters} from "vuex"
 let that
 export default {
   components: {
@@ -366,6 +366,7 @@ export default {
       isShowExamine: false,
       isShowReturn: false,
 
+      salesTypeList:[],
       editId: null,
       isShowEditDateDialog: false,
       dateForm: {
@@ -396,6 +397,7 @@ export default {
         enginOrderType: 'TRADE', // TRADE=商用 HOME=家用
       }
     },
+
   },
 
   beforeCreate() {
@@ -403,6 +405,7 @@ export default {
   },
 
   created() {
+
     this.getSalesTypeList();
     this.getSalesmanList();
     this.getList();

+ 10 - 5
src/views/supply/engin/components/commerce_form.vue

@@ -27,7 +27,7 @@
         </el-col>
         <el-col :xs="24" :sm="12" :lg="8">
           <el-form-item label="业务员" prop="salesMan">
-            <el-select v-model="mainForm.salesMan" placeholder="选择业务员" size="small" filterable clearable style="width: 100%">
+            <el-select v-model="mainForm.salesMan" disabled placeholder="选择业务员" size="small" filterable clearable style="width: 100%">
               <el-option
                 v-for="item in salesmanList"
                 :key="item.adminUserId"
@@ -86,7 +86,7 @@
         </el-col>
         <el-col :xs="24" :sm="12" :lg="8">
           <el-form-item label="工程编号" prop="enginNum">
-            <el-input v-model="mainForm.enginNum" placeholder="请输入工程编号"></el-input>
+            <el-input disabled v-model="mainForm.enginNum" placeholder="请输入工程编号"></el-input>
           </el-form-item>
         </el-col>
         <el-col :xs="24" :sm="12" :lg="8">
@@ -109,7 +109,7 @@
             <el-input v-model="mainForm.address" placeholder="请输入安装地址" disabled></el-input>
           </el-form-item>
         </el-col>
-        <el-col :xs="24" :sm="24" :lg="16">
+        <el-col :xs="24" :sm="24" :lg="16" v-if="!isDealer">
           <el-form-item label="格力内部备注" prop="greeRemark">
             <el-input v-model="mainForm.greeRemark" placeholder="请输入格力内部备注"></el-input>
           </el-form-item>
@@ -129,7 +129,7 @@
             <el-input v-model="mainForm.greeReply" placeholder="请输入格力回复"></el-input>
           </el-form-item>
         </el-col>
-        <el-col :xs="24" :sm="24" :lg="24">
+        <el-col :xs="24" :sm="24" :lg="24" v-if="!isDealer">
           <el-form-item label="备注" prop="remark">
             <el-input v-model="mainForm.remark" placeholder="请输入备注"></el-input>
           </el-form-item>
@@ -347,6 +347,7 @@
           <el-table-column align="center" prop="enginInfoNo" label="工程信息单" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" prop="projectName" label="工程项目" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" prop="useUnit" label="使用单位" show-overflow-tooltip></el-table-column>
+
         </el-table>
       </div>
       <div class="pagination clearfix">
@@ -374,6 +375,7 @@
 import { getOrderDetail, getComLoginList, getComLoginDetail, getWarehouseList, addCom, editCom, submitCom, checkStock, getWalletList } from "@/api/supply/engin";
 import { getDictList, getTypeList, getSalesmanList } from '@/api/common'
 import { findElem } from '@/utils/util'
+import { mapGetters } from "vuex";
 
 let that
 export default {
@@ -464,6 +466,7 @@ export default {
   },
 
   computed: {
+     ...mapGetters(['isCustomer']),
     isDealer() {
       return JSON.parse(localStorage.getItem("supply_user")).isCustomer
     },
@@ -764,8 +767,10 @@ export default {
       if(this.goodsList[index].customerWalletId) {
         let obj = this.goodsList[index].wallets.find(o => o.customerWalletId == this.goodsList[index].customerWalletId);
         this.goodsList[index].customerWalletName = obj.customerWalletName;
-        this.goodsList[index].serviceId = obj.serviceId;
+          if (index === 1) {
+               this.goodsList[index].serviceId = obj.serviceId;
         this.goodsList[index].serviceName = obj.serviceName;
+          }
       }else {
         this.goodsList[index].customerWalletName = '';
         this.goodsList[index].serviceId = '';

+ 4 - 1
src/views/supply/engin/components/engin_detail.vue

@@ -72,6 +72,7 @@
           <div class="label">安装地址</div>
           <div class="value">{{detailData.installAddress}}</div>
         </el-col>
+        <template v-if="!isCustomer">
         <el-col :span="16" class="item">
           <div class="label">格力内部备注</div>
           <div class="value">{{detailData.geLiInerNote}}</div>
@@ -80,6 +81,7 @@
           <div class="label">权限分类</div>
           <div class="value">{{detailData.powerCategory}}</div>
         </el-col>
+        </template>
         <el-col :span="24" class="item">
           <div class="label">格力回复</div>
           <div class="value">{{detailData.geLiNote}}</div>
@@ -177,7 +179,7 @@
 
 <script>
 import { getEnginDetail, overEngin } from "@/api/supply/engin";
-
+import { mapGetters } from "vuex";
 export default {
   name: 'EnginDetail',
   componentName: 'EnginDetail',
@@ -202,6 +204,7 @@ export default {
   },
 
   computed: {
+     ...mapGetters(['isCustomer']),
     isExamine() {
       return this.detailData.examineStatus === 'OK' || this.detailData.examineStatus === 'FAIL'
     },

+ 8 - 3
src/views/supply/engin/components/engin_examine.vue

@@ -118,7 +118,7 @@
             <el-input v-model="detailData.installAddress" placeholder="请输入安装地址"></el-input>
           </div>
         </el-col>
-        <el-col :span="24" class="item">
+        <el-col :span="24" class="item" v-if="!isCustomer">
           <div class="label">格力内部备注</div>
           <div class="value">
             <el-input v-model="detailData.geLiInerNote" placeholder="请输入格力内部备注"></el-input>
@@ -340,6 +340,7 @@
 <script>
 import { getEnginDetail, getRetailProductList, examineEngin } from "@/api/supply/engin";
 import { getTypeList, getSalesmanList, getDictList } from "@/api/common";
+import { mapGetters } from "vuex";
 
 export default {
   name: 'EnginExamine',
@@ -388,7 +389,7 @@ export default {
         {value: '医院医疗', label: '医院医疗'},
         {value: '其他', label: '其他'},
       ],
-      
+
       isShowGoodsDialog: false,
       goodsScreenForm: {
         proNum: '',
@@ -406,9 +407,13 @@ export default {
 
       leftSelection: [],
       rightSelection: [],
+
+      salesTypeList:[]
     }
   },
-
+  computed:{
+...mapGetters(['isCustomer']),
+  },
   created() {
     this.getDetail();
     this.getTypeList();

+ 4 - 0
src/views/supply/engin/components/engin_form.vue

@@ -305,6 +305,8 @@
             <el-table-column align="center" label="产品名称" prop="name" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="产品型号" prop="specification" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="产品价格" prop="batchPrice" min-width="80" show-overflow-tooltip></el-table-column>
+                                            <el-table-column align="center" prop="saleName" label="销售类型" show-overflow-tooltip></el-table-column>
+
           </el-table>
           <div class="pagination clearfix" style="margin-top: 10px">
             <div class="fr">
@@ -332,6 +334,8 @@
             <el-table-column align="center" label="产品名称" prop="name" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="产品型号" prop="specification" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="产品价格" prop="batchPrice" min-width="80" show-overflow-tooltip></el-table-column>
+                                <el-table-column align="center" prop="saleName" label="销售类型" show-overflow-tooltip></el-table-column>
+
           </el-table>
         </div>
       </div>

+ 1 - 0
src/views/supply/engin/home_list.vue

@@ -388,6 +388,7 @@ export default {
       dateForm: {
         date: '',
       },
+      salesTypeList:[]
     }
   },