qymljy 2 năm trước cách đây
mục cha
commit
f5a5355841

+ 13 - 12
src/HDrpManagement/toolBorrowingMag/detail/index.vue

@@ -119,11 +119,7 @@ export default {
           value:this.mainData.billdate
         },
         {
-          label:'经销商',
-          value:this.mainData.enterprisename
-        },
-        {
-          label:'订单状态',
+          label:'状态',
           value:this.mainData.status,
           style:function () {
             let style = {}
@@ -153,17 +149,25 @@ export default {
           }
         },
         {
-          label:'合同',
-          value:this.mainData.contract_title?this.mainData.contract_title:'无合同'
+          label:'企业名称',
+          value:this.mainData.enterprisename
         },
         {
           label:'合计数量',
           value:this.mainData.qty * this.mainData.toolcount
         },
         {
-          label:'金额',
+          label:'合计金额',
           value:this.tool.formatAmount(this.mainData.amount,2)
         },
+        {
+          label:'借用合同',
+          value:this.mainData.contract_title?this.mainData.contract_title:'无合同'
+        },
+        {
+          label:'审核日期',
+          value:this.mainData.checkdate
+        },
         {
           label:'收货人',
           value:this.mainData.name
@@ -172,10 +176,7 @@ export default {
           label:'收货地址',
           value:this.mainData.province + this.mainData.city + this.mainData.county + this.mainData.address
         },
-        {
-          label:'审核日期',
-          value:this.mainData.checkdate
-        },
+
         {
           label:'备注',
           value:this.mainData.remarks

+ 3 - 2
src/HManagement/clueManage/clue_public/modules/distribution_saler.vue

@@ -20,7 +20,7 @@
             <p v-else>{{scope.column.data[scope.column.columnname]}}</p>
           </template>
           <template v-slot:opreation="scope">
-            <el-button type="text" size="mini" @click="getMatchAgentList(scope.data)">{{scope.data.sales.length === 0?'匹 配':'更 换'}}</el-button>
+            <el-button type="text" size="mini" @click="getMatchAgentList(scope.data)" :style="scope.data.sales.length === 0?'':'color:#d73a33'">{{scope.data.sales.length === 0?'匹 配':'更 换'}}</el-button>
           </template>
         </tableLayout>
       </div>
@@ -46,7 +46,8 @@
             <p v-else>{{scope.column.data[scope.column.columnname]}}</p>
           </template>
           <template v-slot:opreation="scope">
-            <i :style="act_saler.hrid === scope.data.hrid?'color:#3774f6':''" class="el-icon-success large-icon" @click="selectSaler(scope)"></i>
+<!--            <i :style="act_saler.hrid === scope.data.hrid?'color:#3774f6':''" class="el-icon-success large-icon" @click="selectSaler(scope)"></i>-->
+            <i :style="scope.data.ismatch=== 1?'color:#3774f6':''" class="el-icon-success large-icon" @click="selectSaler(scope)"></i>
           </template>
         </tableLayout>
       </div>

+ 1 - 1
src/HManagement/clueManage/clue_rule/modules/setSaler.vue

@@ -3,7 +3,7 @@
     <div class="flex-align-center flex-between">
       <el-form size="small" inline label-position="right" label-width="50px" :model="search">
         <el-form-item label="搜索">
-          <el-input v-model="search.condition" prefix-icon="el-icon-search" placeholder="编号,业务员名称" @clear="listData(params.content.pageNumber = 1)" @keyup.native.enter="listData(params.content.pageNumber = 1)" clearable></el-input>
+          <el-input v-model="search.condition" prefix-icon="el-icon-search" placeholder="编号,业务员名称,手机号码" @clear="listData(params.content.pageNumber = 1)" @keyup.native.enter="listData(params.content.pageNumber = 1)" clearable></el-input>
         </el-form-item>
       </el-form>
       <slot name="add" class="normal-margin"></slot>

+ 7 - 7
src/SDrpManagement/ProductGroup/modules/GroupDetail/groupDetail.vue

@@ -4,9 +4,9 @@
   <el-tag style="margin-left: 15px" size="small" >{{selectProduct.brandname}}</el-tag>
   <div class="product-detail container flex-align-stretch" style="width: 100%;flex-wrap:nowrap">
     <div>
-      <el-image style="width:400px;height:400px;margin-right:30px" :src="actImage?actImage.url:''" fit="cover" />
+     <el-image style="width:400px;height:400px;margin-right:30px" :src="actImage?actImage.url:''" fit="cover" />
       <div class="flex-align-stretch column">
-        <el-image class="thumImage mt-10" :class="item.attachmentid === actImage.attachmentid?'act':''" v-for="item in selectProduct.attinfos" :key="item.index" :src="item.url" @click="actImage = item" fit="cover" />
+        <el-image class="thumImage  mt-10" :class="item.attachmentid === actImage.attachmentid?'act':''" v-for="item in selectProduct.attinfos" :key="item.index" :src="item.url" @click="actImage = item" fit="cover" />
       </div>
     </div>
 
@@ -27,7 +27,7 @@
         <p class="normal-margin">标准:&emsp;{{selectProduct.standards || '--'}}</p>
       </div>
       <div v-if="selectProduct.itemextend">
-        <p class="normal-margin">材质:&emsp;{{selectProduct.itemextend.length? selectProduct.itemextend[0].material :'--'}}</p>
+        <p class="normal-margin">材质:&emsp;{{selectProduct.itemextend.length? selectProduct.itemextend[0].material?selectProduct.itemextend[0].material:'--' :'--'}}</p>
       </div>
       <div class="flex-align-center" style="margin-bottom:30px">
         <p>数量:&emsp;</p>
@@ -50,7 +50,7 @@
         <div class="content normal-margin" style="max-height:300px;width:850px;overflow-y:scroll;">
 <!--          <p class="inline-16">更多:</p>-->
           <el-tag class="inline-16" style="margin-top: 5px;margin-bottom: 5px;width: 120px" @click="typeClick(item)" v-for="(item,index) in detail" :key="index" size="small" :effect="selectProduct.itemno == item.itemno ? 'dark' : 'plain'">
-            {{item.spec.length >14?item.spec.substring(0,13)+'...':item.spec}}
+            {{item.spec?item.spec.length >14?item.spec.substring(0,13)+'...':item.spec:item.spec}}
           </el-tag>
 <!--          <span style="color: #4f7bfd;width: 100px"  @click="typeClick(item)" v-for="(item,index) in detail" :key="index">
               {{item.model}}
@@ -153,13 +153,13 @@ export default {
           "sa_itemgroupid": this.$route.query.id
         }
       })
-      console.log(res.data.itemextend)
+      res.code === 0 ?this.$message.error(res.msg): console.log(res.data.itemextend)
 
       this.detail = res.data
       this.selectProduct = this.detail ? this.detail[0] : ''
-      this.actImage = this.detail ? this.detail[0].attinfos[0] : {}
+      this.actImage = this.detail ? this.detail[0].attinfos ? this.detail[0].attinfos[0]:{} : {}
       this.tradefield  = this.detail ? this.detail[0].tradefield : []
-      this.actTradefield = this.detail[0].tradefield[0].tradefield
+      this.actTradefield = this.detail?this.detail[0].tradefield?this.detail[0].tradefield[0]:'':''
 
     },
     countChange (num) {

+ 12 - 11
src/SDrpManagement/salerToolBorrowing/detail/index.vue

@@ -69,10 +69,6 @@ export default {
           label:'单据日期',
           value:this.mainData.billdate
         },
-        {
-          label:'经销商',
-          value:this.mainData.enterprisename
-        },
         {
           label:'状态',
           value:this.mainData.status,
@@ -104,17 +100,25 @@ export default {
           }
         },
         {
-          label:'合同',
-          value:this.mainData.contract_title?this.mainData.contract_title:'无合同'
+          label:'企业名称',
+          value:this.mainData.enterprisename
         },
         {
           label:'合计数量',
           value:this.mainData.qty * this.mainData.toolcount
         },
         {
-          label:'金额',
+          label:'合计金额',
           value:this.tool.formatAmount(this.mainData.amount,2)
         },
+        {
+          label:'借用合同',
+          value:this.mainData.contract_title?this.mainData.contract_title:'无合同'
+        },
+        {
+          label:'审核日期',
+          value:this.mainData.checkdate
+        },
         {
           label:'收货人',
           value:this.mainData.name
@@ -123,10 +127,7 @@ export default {
           label:'收货地址',
           value:this.mainData.province + this.mainData.city + this.mainData.county + this.mainData.address
         },
-        {
-          label:'审核日期',
-          value:this.mainData.checkdate
-        },
+
         {
           label:'备注',
           value:this.mainData.remarks

+ 4 - 2
src/components/financialInfo/index.vue

@@ -134,10 +134,12 @@ export default {
     },
     clearData(){
       this.search = ""
+      this.queryfinancialinfo()
     },
     queryClick(){
-      this.params.content.where.condition = this.search
-      this.listData()
+      this.param.content.where.condition = this.search
+      this.param.content.pageNumber = 1
+      this.queryfinancialinfo()
     }
   },
   mounted () {

+ 2 - 2
vue.config.js

@@ -14,8 +14,8 @@ module.exports = {
       port: 8000,
       proxy: {
         '/apis': {
-          // target: 'http://61.164.207.46:8000',  // target host*/
-          target: 'https://oms.idcgroup.com.cn:8079/',  // target host
+          target: 'http://61.164.207.46:8000',  // target host*/
+          // target: 'https://oms.idcgroup.com.cn:8079/',  // target host
           // target: 'localhost:8080',  // target host
           ws: true,  // proxy websockets 
           changeOrigin: true,  // needed for virtual hosted sites