代码更新

src/HDrpManagement/ProductMag/detail/index.vue

@@ -136,10 +136,10 @@ export default {
             let style = {}
             switch (that.mainData.status) {
               case '审核':
-                style = {color:"#3874f6"}
+                style = {color:"#52C41A"}
                 break;
               case '新建':
-                style = {color:"#333333"}
+                style = {color:"#000000"}
                 break;
               default:
                 break;

src/HDrpManagement/ProductMag/detail/modules/detailedData.vue

@@ -5,7 +5,7 @@
         <div slot="title" class="my-label__title">基本信息</div>
         <el-descriptions-item  label="商品编码">{{ basic.itemno}}</el-descriptions-item>
         <el-descriptions-item  label="商品名称">{{ basic.itemname}}</el-descriptions-item>
-        <el-descriptions-item  label="状态"><span :style="basic.status == '审核' ? 'color:#3874f6' : 'color:#333333'">{{ basic.status}}</span></el-descriptions-item>
+        <el-descriptions-item  label="状态"><span :style="basic.status == '审核' ? 'color:#52C41A' : 'color:#000000'">{{ basic.status}}</span></el-descriptions-item>
         <el-descriptions-item  label="品号">{{ basic.erpitemno}}</el-descriptions-item>
         <el-descriptions-item  label="品名">{{ basic.erpitemname}}</el-descriptions-item>
         <el-descriptions-item  label="外形尺寸">长:{{ basic.length}};宽:{{basic.width}};高:{{basic.height}}</el-descriptions-item>

src/HDrpManagement/ProductMag/index.vue

@@ -93,8 +93,8 @@
           {{scope.data.column.data[[scope.data.column.columnname]] === 0?'否':'是'}}
         </p>
         <p v-else-if="scope.data.column.columnname === 'status'">
-          <span style="color:#3874f6" v-if="scope.data.column.data[[scope.data.column.columnname]] == '审核'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
-          <span style="color:#333333" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '新建'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
+          <span style="color:#52C41A" v-if="scope.data.column.data[[scope.data.column.columnname]] == '审核'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
+          <span style="color:#000000" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '新建'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
         </p>
         <p v-else>{{scope.data.column.data[[scope.data.column.columnname]]}}</p>
         </div>

src/HDrpManagement/prodectFileData/components/add.vue

@@ -17,6 +17,10 @@
             <div v-else-if="scope.column.columnname === 'isonsale'">
               <span>{{scope.column.data.isonsale ? '上架' : '下架'}}</span>
             </div>
+            <p v-else-if="scope.column.columnname === 'status'">
+              <span style="color:#52C41A" v-if="scope.column.data[[scope.column.columnname]] == '审核'">{{scope.column.data[[scope.column.columnname]]}}</span>
+              <span style="color:#000000" v-else-if="scope.column.data[[scope.column.columnname]] == '新建'">{{scope.column.data[[scope.column.columnname]]}}</span>
+            </p>
             <p v-else>{{scope.column.data[scope.column.columnname]}}</p>
           </template>
 

src/HDrpManagement/prodectFileData/components/relationList.vue

@@ -11,6 +11,10 @@
           >上架
           </span>
         </div>
+        <p v-else-if="scope.column.columnname === 'status'">
+          <span style="color:#52C41A" v-if="scope.column.data[[scope.column.columnname]] == '审核'">{{scope.column.data[[scope.column.columnname]]}}</span>
+          <span style="color:#000000" v-else-if="scope.column.data[[scope.column.columnname]] == '新建'">{{scope.column.data[[scope.column.columnname]]}}</span>
+        </p>
         <p v-else>{{scope.column.data[scope.column.columnname]}}</p>
       </template>
       <template v-slot:opreation="scope">

src/HManagement/personalTarget/personalTargetStatistics/index.vue

@@ -567,7 +567,7 @@ export default {
       })
       window.open(res.data,'_self')
     },
-    async yearList(){
+    async yearList(siteid){
       const res = await this.$api.requested({
         "classname": "sysmanage.develop.optiontype.optiontype",
         "method": "optiontypeselect",
@@ -576,7 +576,7 @@ export default {
           "pageSize": 20,
           "typename": "targetyearofpersonal",
           "parameter": {
-            "siteid": "YOSTEST2"
+            "siteid": siteid
           }
         }
       })
@@ -594,7 +594,8 @@ export default {
   },
   mounted () {
     this.queryData()
-    this.yearList()
+    const siteid = JSON.parse(sessionStorage.getItem('active_account')).siteid
+    this.yearList(siteid)
   }
 }
 

src/HManagement/projectTarget/projectTargetStatistics/index.vue

@@ -576,7 +576,7 @@ export default {
       })
       window.open(res.data,'_self')
     },
-    async yearList(){
+    async yearList(siteid){
       const res = await this.$api.requested({
         "classname": "sysmanage.develop.optiontype.optiontype",
         "method": "optiontypeselect",
@@ -585,7 +585,7 @@ export default {
           "pageSize": 20,
           "typename": "targetyearofproject",
           "parameter": {
-            "siteid": "YOSTEST2"
+            "siteid": siteid
           }
         }
       })
@@ -603,7 +603,8 @@ export default {
   },
   mounted () {
     this.queryData()
-    this.yearList()
+    const siteid = JSON.parse(sessionStorage.getItem('active_account')).siteid
+    this.yearList(siteid)
   }
 }
 

src/SDrpManagement/ProductGroup/modules/GroupDetail/groupDetail.vue

@@ -1,6 +1,7 @@
 <template>
 <div class="container normal-panel">
-  <div class="product-detail container flex-align-stretch">
+  <el-tag style="margin-left: 15px" size="small" >{{selectProduct.brandname}}</el-tag>
+  <div class="product-detail container flex-align-stretch" style="width: 100%">
     <div>
       <el-image style="width:400px;height:400px;margin-right:30px" :src="actImage.url" fit="cover" />
       <div class="flex-align-stretch column">
@@ -8,7 +9,7 @@
       </div>
     </div>
 
-    <div style="flex:1">
+    <div style="flex:1;">
       <p class="productName normal-margin">
         <el-tag class="inline-16" @click="actTradefield = item.tradefield" v-for="(item,index) in tradefield" :key="index" size="small" :effect="actTradefield === item.tradefield ? 'dark' : 'plain'">{{item.tradefield}}
         </el-tag>
@@ -25,12 +26,18 @@
         <el-input-number v-model="count" :min="selectProduct.orderminqty" :step="selectProduct.orderaddqty" size="small" label="描述文字"></el-input-number>
         <span style="color:#888;font-size: 14px;margin-left: 10px">起订量：{{selectProduct.orderminqty}}</span>
         <span style="color:#888;font-size: 14px;margin-left: 10px">增量：{{selectProduct.orderaddqty}}</span>
+        <span style="color:#888;font-size: 14px;margin-left: 10px">库存：
+          <span v-if="selectProduct.stockstatus === '紧缺'" style="color: red">{{selectProduct.stockstatus}}</span>
+          <span v-else-if="selectProduct.stockstatus === '充足'" style="color: green">{{selectProduct.stockstatus}}</span>
+          <span v-else>{{selectProduct.stockstatus}}</span>
+        </span>
       </div>
       <p class="normal-margin">当前型号:&emsp;{{selectProduct.model}}</p>
       <div class="type">
         <div class="content normal-margin">
-          <p class="inline-16">更多型号:</p>
-          <el-tag class="inline-16" @click="typeClick(item)" v-for="(item,index) in detail" :key="index" size="small" :effect="selectProduct.itemno == item.itemno ? 'dark' : 'plain'">{{item.model}}
+          <p class="inline-16">更多规格:</p>
+          <el-tag class="inline-16" style="margin-top: 5px;margin-bottom: 5px" @click="typeClick(item)" v-for="(item,index) in detail" :key="index" size="small" :effect="selectProduct.itemno == item.itemno ? 'dark' : 'plain'">
+            {{item.model.length >10?item.model.substring(0,9)+'...':item.model}}
           </el-tag>
 <!--          <span style="color: #4f7bfd;width: 100px"  @click="typeClick(item)" v-for="(item,index) in detail" :key="index">
               {{item.model}}

src/SDrpManagement/ProductGroup/modules/Select.vue

@@ -1,17 +1,17 @@
 <template>
   <div class="border-bottom">
     <div>
-      <ul class="flex-align-center ">
-        <li :class="field_act === ''?'act':''" class="brand-item" @click="clickField('')">全部领域</li>
-        <li :class="field_act === item.sys_enterprise_tradefieldid?'act':''" class="brand-item" v-for="item in fields" :key="item.sys_enterprise_tradefieldid" @click="clickField(item)">{{item.tradefield}}</li>
+      <ul class="flex-align-center normal-margin" >
+        <li  :class="field_act === ''?'act':''" class="brand-item border-all" @click="clickField('')" >全部领域</li>
+        <li  :class="field_act === item.sys_enterprise_tradefieldid?'act':''" class="brand-item margin-notAll" v-for="item in fields" :key="item.sys_enterprise_tradefieldid" @click="clickField(item)">{{item.tradefield}}</li>
       </ul>
-      <ul class="flex-align-center ">
-        <li :class="!brand_act?'act':''" class="brand-item" @click="clickBrand('')">全部品牌</li>
-        <li :class="brand_act === item.sa_brandid?'act':''" class="brand-item" v-for="item in brands" :key="item.sa_brandid" @click="clickBrand(item.sa_brandid)">{{item.brandname}}</li>
+      <ul class="flex-align-center normal-margin">
+        <li :class="!brand_act?'act':''" class="brand-item border-all" @click="clickBrand('')">全部品牌</li>
+        <li  :class="brand_act === item.sa_brandid?'act':''" class="brand-item margin-notAll" v-for="item in brands" :key="item.sa_brandid" @click="clickBrand(item.sa_brandid)">{{item.brandname}}</li>
       </ul>
-      <ul class="flex-align-center ">
-        <li :class="class_act === ''?'act':''" class="brand-item" @click="clickClass('')">全部分类</li>
-        <li :class="class_act === item.itemclassnum?'act':''" class="brand-item" v-for="item in itemclass" :key="item.itemclassnum" @click="clickClass(item)">{{item.itemclassname}}</li>
+      <ul class="flex-align-center normal-margin">
+        <li  :class="class_act === ''?'act':''" class="brand-item border-all" @click="clickClass('')">全部分类</li>
+        <li  :class="class_act === item.itemclassnum?'act':''" class="brand-item margin-notAll" v-for="item in itemclass" :key="item.itemclassnum" @click="clickClass(item)">{{item.itemclassname}}</li>
       </ul>
       <classTree style="padding-left:31px" :data="activeClass.subdep" @onClassChange="change"></classTree>
     </div>
@@ -127,10 +127,20 @@ export default {
 }
 .act{
   color:#3874f6;
+  font-weight: bold;
 }
 .border-bottom{
   padding-bottom:16px;
   border-bottom: 1px solid #e3e5ea;
 }
+.normal-margin{
+  margin-bottom: 2px !important;
+}
+.border-all{
+  margin-left: 0px
+}
+.margin-notAll{
+  margin-left: -18px
+}
 
 </style>

src/SDrpManagement/ProductGroup/modules/classTree.vue

@@ -2,7 +2,8 @@
   <div>
     <div class="flex-align-center">
       <div v-for="item in data" :key="item.index" @click="classClick(item)">
-        <p class="normal-margin class-item"  :class="class_act === item.itemclassnum?'act':''">{{item.itemclassname}}</p>
+        <p v-if="item.index === 1" class="normal-margin class-item classIndex"  :class="class_act === item.itemclassnum?'act':''">{{item.itemclassname}}</p>
+        <p v-else  class="normal-margin class-item classIndexItem"  :class="class_act === item.itemclassnum?'act':''">{{item.itemclassname}}</p>
         <Tree v-if="item.subdep" :data="item.subdep" @onClassChange="change"></Tree>
       </div>
     </div>
@@ -42,6 +43,16 @@ export default {
 }
 .act{
   color:#3874f6;
+  font-weight: bold;
+}
+.classIndex{
+  margin-bottom: 0px
+  !important;
+}
+.classIndexItem{
+  margin-left: -18px;
+  margin-bottom: 0px
+  !important;
 }
 
 </style>

src/SDrpManagement/Products/modules/Select.vue

@@ -2,16 +2,16 @@
   <div class="border-bottom">
     <div>
       <ul class="flex-align-center normal-margin">
-        <li :class="field_act === ''?'act':''" class="brand-item" @click="clickField('')">全部领域</li>
-        <li :class="field_act === item.sys_enterprise_tradefieldid?'act':''" class="brand-item" v-for="item in fields" :key="item.sys_enterprise_tradefieldid" @click="clickField(item)">{{item.tradefield}}</li>
+        <li :class="field_act === ''?'act':''" class="brand-item border-all" @click="clickField('')">全部领域</li>
+        <li :class="field_act === item.sys_enterprise_tradefieldid?'act':''" class="brand-item margin-notAll" v-for="item in fields" :key="item.sys_enterprise_tradefieldid" @click="clickField(item)">{{item.tradefield}}</li>
       </ul>
       <ul class="flex-align-center normal-margin">
-        <li :class="!brand_act?'act':''" class="brand-item" @click="clickBrand('')">全部品牌</li>
-        <li :class="brand_act === item.sa_brandid?'act':''" class="brand-item" v-for="item in brands" :key="item.sa_brandid" @click="clickBrand(item.sa_brandid)">{{item.brandname}}</li>
+        <li :class="!brand_act?'act':''" class="brand-item border-all" @click="clickBrand('')">全部品牌</li>
+        <li :class="brand_act === item.sa_brandid?'act':''" class="brand-item margin-notAll" v-for="item in brands" :key="item.sa_brandid" @click="clickBrand(item.sa_brandid)">{{item.brandname}}</li>
       </ul>
       <ul class="flex-align-center normal-margin">
-        <li :class="class_act === ''?'act':''" class="brand-item" @click="clickClass('')">全部分类</li>
-        <li :class="class_act === item.itemclassnum?'act':''" class="brand-item" v-for="item in itemclass" :key="item.itemclassnum" @click="clickClass(item)">{{item.itemclassname}}</li>
+        <li :class="class_act === ''?'act':''" class="brand-item border-all" @click="clickClass('')">全部分类</li>
+        <li :class="class_act === item.itemclassnum?'act':''" class="brand-item margin-notAll" v-for="item in itemclass" :key="item.itemclassnum" @click="clickClass(item)">{{item.itemclassname}}</li>
       </ul>
       <classTree style="padding-left:31px" :data="activeClass.subdep" @onClassChange="change"></classTree>
     </div>
@@ -127,10 +127,20 @@ export default {
 }
 .act{
   color:#3874f6;
+  font-weight: bold;
 }
 .border-bottom{
   padding-bottom:16px;
   border-bottom: 1px solid #e3e5ea;
 }
+.normal-margin{
+  margin-bottom: 2px !important;
+}
+.border-all{
+  margin-left: 0px
+}
+.margin-notAll{
+  margin-left: -18px
+}
 
 </style>

src/SDrpManagement/Products/modules/classTree.vue

@@ -2,7 +2,8 @@
   <div>
     <div class="flex-align-center">
       <div v-for="item in data" :key="item.index" @click="classClick(item)">
-        <p class="normal-margin class-item"  :class="class_act === item.itemclassnum?'act':''">{{item.itemclassname}}</p>
+        <p v-if="item.index === 1" class="normal-margin class-item classIndex"  :class="class_act === item.itemclassnum?'act':''">{{item.itemclassname}}</p>
+        <p v-else class="normal-margin class-item classIndexItem"  :class="class_act === item.itemclassnum?'act':''">{{item.itemclassname}}</p>
         <Tree v-if="item.subdep" :data="item.subdep" @onClassChange="change"></Tree>
       </div>
     </div>
@@ -42,6 +43,16 @@ export default {
 }
 .act{
   color:#3874f6;
+  font-weight: bold;
+}
+.classIndex{
+  margin-bottom: 0px
+  !important;
+}
+.classIndexItem{
+  margin-left: -18px;
+  margin-bottom: 0px
+  !important;
 }
 
 </style>

src/SDrpManagement/Products/modules/list.vue

@@ -22,7 +22,8 @@
       </el-row> -->
       <div v-if="list.length > 0">
         <div class="group-list content">
-          <div  @click="$router.push({path:'/ProductDetails',query:{id:item.itemid,brandid:params.content.brandids[0]}})" class="group-item" v-for="item in list" :key="item.index">
+<!--          <div  @click="$router.push({path:'/ProductDetails',query:{id:item.itemid,brandid:params.content.brandids[0]}})" class="group-item" v-for="item in list" :key="item.index">-->
+          <div  class="group-item" v-for="item in list" :key="item.index">
             <div class="top">
               <el-image style="width:100%" :src="Object.keys(item.attinfos).length > 0 ? item.attinfos[0].url : ''" fit="cover" />
             </div>
@@ -31,7 +32,8 @@
               <p class="descript">商品编号：{{item.itemno}}</p>
               <p class="descript">所属营销分类：<span v-for="cls in item.itemclass" :key="cls.index">{{cls.itemclassname}},</span></p>
               <div class="flex-align-center flex-between">
-                <p><span class="product-price">¥{{item.gradeprice}}</span>&nbsp;<small class="text-throughline">¥{{item.oldprice}}</small></p>
+<!--                <p><span class="product-price">¥{{item.gradeprice}}</span>&nbsp;<small class="text-throughline">¥{{item.oldprice}}</small></p>-->
+                <p><span class="product-price">¥{{item.gradeprice}}</span>&nbsp;</p>
                 <div class="shopcart-btn">
                   <i @click.stop="insertToShopCart(item)" style="font-size:1.5rem;color:#666" class="el-icon-shopping-cart-2"></i>
                 </div>

src/SDrpManagement/QuotedPrice/detail/modules/productInventory/index.vue

@@ -13,7 +13,7 @@
           clearable>
       </el-input>&nbsp;
 <!--      <product_table style="float: right" :data="data"  ref="quoterPrice" @productAdd="productInitialization" ></product_table>-->
-      <productTableProject v-if="tool.checkAuth($route.name,'productDetails') && data.status === '新建' && disabled"  :sa_projectid="data.sa_projectid" :type="data.quotedpricetype" class="inline-16" @productAdd="productData"></productTableProject>
+      <productTableProject v-if="tool.checkAuth($route.name,'productDetails') && data.status === '新建' && disabled && data.quotedpricetype === '项目报价'"  :sa_projectid="data.sa_projectid" :type="data.quotedpricetype" class="inline-16" @productAdd="productData"></productTableProject>
       <productTable v-if="tool.checkAuth($route.name,'productDetails') && data.status === '新建' && disabled"  class="inline-16" @productAdd="productData"></productTable>
     </div>
     <div class="produtMag-panel">

src/SDrpManagement/salerPrivatecustomer/detail/customerDetail.vue

@@ -23,7 +23,7 @@
         <share class="inline-16" v-if="tool.checkAuth($route.name,'share') && mainData.sourcepoolname === ''" :disabled="mainData.disabled" :id="mainData.sa_customersid" @onshow="onSuccess" @shareSuccess="onSuccess"></share>
         <toBack class="inline-16" v-if="tool.checkAuth($route.name,'back') && mainData.sa_customerpoolid_source !== 0" :disabled="mainData.disabled" :data="mainData" @backSuccess="onSuccess"></toBack>
         <to_void class="inline-16" v-if="tool.checkAuth($route.name,'toVoid')" :id="mainData.sa_customersid" :disabled="mainData.disabled" @onshow="onSuccess" @toVoidSuccess="onSuccess"></to_void>
-        <recovery class="inline-16" v-if="tool.checkAuth($route.name,'recovery') " :disabled="mainData.disabled" :data="mainData" @onshow="onSuccess" @backSuccess="onSuccess"></recovery>
+        <recovery class="inline-16" v-if="tool.checkAuth($route.name,'recovery') " :data="mainData" @onshow="onSuccess" @backSuccess="onSuccess"></recovery>
       </div>
       <div slot="slot0" >
         <detailed :data="mainData" ref="baseDetail"></detailed>

src/SDrpManagement/salerPrivatecustomer/detail/modules/operation/recovery.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-button style="width:100%"  size="mini" :type="!disabled?'':'primary'" block @click="onshow" :disabled="!disabled">回收</el-button>
+    <el-button style="width:100%"  size="mini" type="primary" block @click="onshow" >回收</el-button>
     <el-dialog title="" :visible.sync="dialogForm" width="400px" append-to-body>
       <div slot="title" style="font-size: 15px">
         回收客户

src/SManagement/personal_target/index.vue

@@ -84,7 +84,7 @@ export default {
     yearChange(data) {
       this.$refs.table.year = data
     },
-    async yearList(){
+    async yearList(siteid){
       const res = await this.$api.requested({
         "classname": "sysmanage.develop.optiontype.optiontype",
         "method": "optiontypeselect",
@@ -93,7 +93,7 @@ export default {
           "pageSize": 20,
           "typename": "targetyearofpersonal",
           "parameter": {
-            "siteid": "YOSTEST2"
+            "siteid": siteid
           }
         }
       })
@@ -131,7 +131,8 @@ export default {
     }
   },
   mounted() {
-    this.yearList()
+    const siteid = JSON.parse(sessionStorage.getItem('active_account')).siteid
+    this.yearList(siteid)
   }
 };
 </script>

src/SManagement/project_target/components/table.vue

@@ -574,7 +574,7 @@ export default {
     yearChange(data) {
       this.year = data
     },
-    async yearList(){
+    async yearList(siteid){
       const res = await this.$api.requested({
         "classname": "sysmanage.develop.optiontype.optiontype",
         "method": "optiontypeselect",
@@ -583,7 +583,7 @@ export default {
           "pageSize": 20,
           "typename": "targetyearofproject",
           "parameter": {
-            "siteid": "YOSTEST2"
+            "siteid": siteid
           }
         }
       })
@@ -609,7 +609,9 @@ export default {
   },
   mounted () {
     /*this.queryData()*/
-    this.yearList()
+
+    const siteid = JSON.parse(sessionStorage.getItem('active_account')).siteid
+    this.yearList(siteid)
   },
   created() {
     this.queryData()

src/SManagement/project_target/index.vue

@@ -12,8 +12,8 @@
         <div class="container normal-panel">
           <table1 ref="table" :data="hrid">
             <template v-slot:detail="scope">
-              <el-button v-if="tool.checkAuth($route.name,'read') && scope.data.data.status !== '新建'" type="text" size="small" @click="$store.dispatch('changeDetailDrawer',true),$router.push({path:'/projectDetail',query:{id:scope.data.data.sa_salestargetbillid,hrid:scope.data.data.hrid,year:scope.data.year,ownerHrid:hrid}})">详 情</el-button>
-              <el-button v-if="tool.checkAuth($route.name,'read') && scope.data.data.status === '新建'" type="text" size="small" @click="$store.dispatch('changeDetailDrawer',true),$router.push({path:'/projectDetail',query:{id:scope.data.data.sa_salestargetbillid,hrid:scope.data.data.hrid,year:scope.data.year,ownerHrid:hrid}})">编 辑</el-button>
+              <el-button v-if="tool.checkAuth($route.name,'read')  && scope.data.data.hrid != hrid" type="text" size="small" @click="$store.dispatch('changeDetailDrawer',true),$router.push({path:'/projectDetail',query:{id:scope.data.data.sa_salestargetbillid,hrid:scope.data.data.hrid,year:scope.data.year,ownerHrid:hrid}})">详 情</el-button>
+              <el-button v-if="tool.checkAuth($route.name,'read') && scope.data.data.status === '新建' && scope.data.data.hrid == hrid" type="text" size="small" @click="$store.dispatch('changeDetailDrawer',true),$router.push({path:'/projectDetail',query:{id:scope.data.data.sa_salestargetbillid,hrid:scope.data.data.hrid,year:scope.data.year,ownerHrid:hrid}})">编 辑</el-button>
 <!--              <el-button v-if="tool.checkAuth($route.name,'update') && scope.data.data.status === '新建' " type="text" size="small" @click="$store.dispatch('DrawerShowChange',true),$router.push({path:'/editProjectInfo',query:{id:scope.data.data.hrid,year:scope.data.year}})">编辑</el-button>-->
             </template>
           </table1>