暂存

src/HDrpManagement/bankStatement/modules/detail.vue

@@ -15,7 +15,17 @@
       <div slot="tags">
       </div>
       <div slot="customOperation" >
-        <Confirm v-if="tool.checkAuth($route.name,'confirm') && mainData.status == '未入账'" @onSuccess="queryMainData()"></Confirm>
+        <Confirm class="inline-16" v-if="tool.checkAuth($route.name,'confirm') && mainData.status == '未入账'" @onSuccess="queryMainData()"></Confirm>
+        <customBtn 
+          btnName="退回"
+          message="确认退回当前数据吗?"
+          idName="20230301101404"
+          keyName="sa_bankstatementid"
+          :id="$route.query.id"
+          @onSuccess="queryMainData"
+          class="inline-16"
+          v-if="mainData.status != '新建' && tool.checkAuth($route.name,'back')"
+        />
       </div>
       <div slot="slot0" >
         <!-- <base-info v-if="detailInfo" :detailInfo="detailInfo"></base-info> -->

src/HDrpManagement/contractManage/components/productList/addProduct.vue

@@ -216,7 +216,7 @@ export default {
                 "qty": data.qty,
                 "marketprice":data.marketprice,
                 "discountrate":data.discountrate,
-                "type":'折扣系数'
+                "type":'指定单价'
               }
             ]
         },
@@ -254,7 +254,8 @@ export default {
           "price": item.price,
           "qty": item.qty,
           "marketprice":item.marketprice,
-          "discountrate":item.discountrate
+          "discountrate":item.discountrate,
+          "type":'指定单价'
         }
       })
       console.log(item,'批量添加')

src/HDrpManagement/contractManage/components/toolList/addTool.vue

@@ -126,7 +126,8 @@ export default {
                 "itemid": data.itemid,
                 "price": data.marketprice,
                 "qty": 1,
-                "marketprice":data.marketprice
+                "marketprice":data.marketprice,
+                "type":'指定单价'
               }
             ]
         },
@@ -143,7 +144,8 @@ export default {
           "itemid": item.itemid,
           "price": item.marketprice,
           "qty": 1,
-          "marketprice":item.marketprice
+          "marketprice":item.marketprice,
+          "type":'指定单价'
         }
       })
       let res = await this.$api.requested({

src/HDrpManagement/logistics/details/index.vue

@@ -143,6 +143,10 @@
             label:'经销商简称',
             value:this.mainData.enterprisename
           },
+          {
+            label:'备注',
+            value:this.mainData.remarks
+          },
         ]
       },
       // 监听切换数据,上一页,下一页

src/HDrpManagement/orderManage/details/tabs/addProduct.vue

@@ -168,6 +168,9 @@ export default {
     },
     onConfirm () {
       this.$emit('onConfirm',this.tableSelectData)
+      this.tableSelectData.forEach(v => {
+        this.tableData.splice(this.tableData.findIndex(j => j.itemid == v.itemid),1)
+      })
     },
     clearSelection () {
       this.$refs.multipleTable.clearSelection();

src/HDrpManagement/orderManage/details/tabs/productlist.vue

@@ -52,7 +52,7 @@
           </template>
         </el-table-column>
         <el-table-column
-            prop="model"
+            prop="spec"
             label="规格"
             width="150">
           <template slot-scope="scope">
@@ -156,16 +156,6 @@
             <el-tag size="mini" type="info" effect="plain">{{scope.row.unit}}</el-tag>
           </template>
         </el-table-column>
-        <el-table-column
-          prop="qty"
-          label="数量"
-          width="180">
-          <template slot-scope="scope">
-            <el-input-number :controls="true" controls-position='right' :step-strictly="true" v-if="data.status === '新建' && data.type !=='特殊订单'" size="mini" v-model="scope.row.qty" :min="scope.row.orderminqty" :step="scope.row.orderaddqty" label="输入数量" @change="rowChange(scope.row,scope.$index)"></el-input-number>
-            <el-input-number :controls="true" controls-position='right' :step-strictly="true" v-if="data.status === '新建' && data.type ==='特殊订单'" size="mini" v-model="scope.row.qty" label="输入数量" @change="rowChange(scope.row,scope.$index)"></el-input-number>
-            <!-- <span v-else>{{scope.row.qty}}</span> -->
-          </template>
-        </el-table-column>
         <el-table-column
           prop="marketprice"
           label="牌价"
@@ -214,13 +204,18 @@
           </template>
         </el-table-column>
         <el-table-column
-          prop="undeliqty"
-          label="未发货数量"
-          width="100">
+            prop="cansaleqty"
+            label="库存数量"
+            width="100">
         </el-table-column>
         <el-table-column
-          prop="stockstatus"
-          label="库存状态"
+            prop="stockstatus"
+            label="库存状态"
+            width="100">
+        </el-table-column>
+        <el-table-column
+          prop="undeliqty"
+          label="未发货数量"
           width="100">
         </el-table-column>
         <el-table-column
@@ -346,7 +341,7 @@ export default {
         "content": {
           "sa_orderid": 0, //订单ID
           "pageNumber": 1,
-          "pageSize": 20,
+          "pageSize": 10000,
           "where": {
             "condition": ""
           }

src/HManagement/clueManage/clue_public/modules/distribution_saler.vue

@@ -6,7 +6,7 @@
         <p class="normal-title" style="margin-bottom:16px">自动分配</p>
         <p class="normal-margin">总共:&nbsp;{{total}}条</p>
         <p class="tips normal-margin">注：1、未匹配业务员的线索，分配时，系统将自动跳过，不予以分配；2、所属业务员有且仅有一个匹配结果。</p>
-        <tableLayout :layout="tablecols" :data="list" :custom="true" :height="tableHieght">
+        <tableLayout :layout="tablecols" :data="list" :custom="true" :height="tableHieght" :fixed="'operation'">
           <template v-slot:customcol="scope">
             <div v-if="scope.column.columnname === 'sales'">
               <div v-if="scope.column.data.sales.length > 0">

src/HManagement/marketing2/agent/details/modules/saleclass/index.vue

@@ -1,9 +1,9 @@
 <template>
   <div>
-    <add-sale-class class="normal-margin" :data="data" @addSuccess="getClassList" v-if="tool.checkAuth($route.name,'salerClass') "/>
+    <add-sale-class class="normal-margin" :data="data" @addSuccess="getClassList" v-if="tool.checkAuth($route.name,'classAdd') "/>
     <tableLayout  :layout="tablecols" :data="saleClassList" :custom="false" height="calc(100vh - 405px)" fixedName="operation">
       <template v-slot:opreation="scope">
-        <Del v-if="tool.checkAuth($route.name,'salerClass')" :id="scope.data.sys_enterprise_saleclassid" @onSuccess="getClassList"/>
+        <Del v-if="tool.checkAuth($route.name,'classDel')" :id="scope.data.sys_enterprise_saleclassid" @onSuccess="getClassList"/>
       </template>
     </tableLayout>
   </div>

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

@@ -1,7 +1,8 @@
 <template>
 <div class="container normal-panel">
+  <span style="font-size:12px;color:#3874f6;text-decoration: underline;cursor: pointer;" @click="$router.back()">返回</span>
   <el-tag style="margin-left: 15px" size="small" >{{selectProduct.brandname}}</el-tag>
-  <div class="product-detail container flex-align-stretch" style="width: 100%">
+  <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" />
       <div class="flex-align-stretch column">
@@ -46,10 +47,10 @@
       </div>
 
       <div class="type">
-        <div class="content normal-margin">
-          <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.spec >20?item.spec.substring(0,19)+'...':item.spec}}
+        <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}}
           </el-tag>
 <!--          <span style="color: #4f7bfd;width: 100px"  @click="typeClick(item)" v-for="(item,index) in detail" :key="index">
               {{item.model}}
@@ -147,6 +148,8 @@ export default {
       let res = await this.$api.requested({
         "id": "20220926142403",
         "content": {
+          "pageNumber": 1,
+          "pageSize": 999,
           "sa_itemgroupid": this.$route.query.id
         }
       })
@@ -277,5 +280,6 @@ export default {
   color: #5a73d3;
   font-size: 15px;
   /*font-weight: bold;*/
+  
 }
 </style>

src/SDrpManagement/ProductGroup/modules/Select.vue

@@ -126,7 +126,7 @@ export default {
 </style>
 <style scoped>
 .brand-item{
-  margin:10px 40px;
+  margin:2px 40px;
   color: #333;
   cursor: pointer;
   transition: .2s all linear;

src/SDrpManagement/Products/modules/Select.vue

@@ -123,7 +123,7 @@ export default {
 </style>
 <style scoped>
 .brand-item{
-  margin:10px 40px;
+  margin:5px 40px;
   color: #333;
   cursor: pointer;
   transition: .2s all linear;

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

@@ -221,7 +221,7 @@
             width="80"
             fixed="right">
           <template slot-scope="scope">
-            <i class="el-icon-check" v-if="scope.row.specialoffer === 1"  style="color: red;font-size: 20px"></i>
+            <i class="el-icon-check" v-if="scope.row.discountDifferenceAmount < 0"  style="color: red;font-size: 20px"></i>
             <p v-else>--</p>
           </template>
         </el-table-column>

src/SDrpManagement/agentOrder/modules/productlist.vue

@@ -51,7 +51,7 @@
       </el-table-column>
       <el-table-column
           label="规格"
-          prop="model">
+          prop="spec">
         <template slot-scope="scope">
           <p><span>{{scope.row.spec}}</span></p>
         </template>

src/SDrpManagement/salerOrder/modules/productlist.vue

@@ -51,7 +51,7 @@
       </el-table-column>
       <el-table-column
           label="规格"
-          prop="model">
+          prop="spec">
         <template slot-scope="scope">
           <p><span>{{scope.row.spec}}</span></p>
         </template>
@@ -144,8 +144,8 @@
         label="折前价格"
         width="100">
         <template slot-scope="scope">
-          <el-input v-if="data.status === '新建'" v-model="scope.row.defaultprice" @change="inputChange(scope.row,scope.$index)" placeholder="输入单价" size="mini"></el-input>
-          <!-- <p>¥&nbsp;{{tool.formatAmount(scope.row.defaultprice,2)}}</p> -->
+          <el-input v-if="canUseInput" v-model="scope.row.defaultprice" @change="inputChange(scope.row,scope.$index)" placeholder="输入单价" size="mini"></el-input>
+          <p v-else>¥&nbsp;{{tool.formatAmount(scope.row.defaultprice,2)}}</p>
         </template>
       </el-table-column>
       <el-table-column
@@ -192,7 +192,7 @@
         width="300"
         fixed="right">
         <template slot-scope="scope">
-          <el-input type="textarea"  :disabled="data.status != '新建'" @blur="onConfirm([scope.row],true)" size="small" v-model="scope.row.remarks" placeholder="请输入备注"></el-input>
+          <el-input  type="textarea"  :disabled="data.status != '新建'" @blur="onConfirm([scope.row],true)" size="small" v-model="scope.row.remarks" placeholder="请输入备注"></el-input>
         </template>
       </el-table-column>
       <el-table-column v-if="data.status === '新建'" width="90" fixed="right">
@@ -264,6 +264,16 @@ export default {
       value2:''
     }
   },
+  computed:{
+    canUseInput () {
+      let salerIsEditPrice = this.data.saler[0].iseditprice
+      if (this.data.type === '标准订单' && salerIsEditPrice && this.data.status === '新建') {
+        return true
+      } else {
+        return false
+      }
+    }
+  },
   components:{
     excel:() =>  import('../details/export_excel'),
     addProduct

src/components/productTable/indexQty.vue

@@ -92,7 +92,7 @@
       </el-table-column>
       <el-table-column
           prop="qty"
-          label="数量"
+          label="数量111"
           fixed="right"
           width="100">
         <template slot-scope="scope">
@@ -120,6 +120,9 @@
           <div v-else-if="scope.row.discountDifferenceAmount < 0 ">
             <p><span :style="[setDownColor]">{{Math.round((scope.row.discountrate * 100) * 100)/100}}</span></p>
           </div>
+          <div v-else>
+            <p><span >{{Math.round((scope.row.discountrate * 100) * 100)/100}}</span></p>
+          </div>
         </template>
       </el-table-column>
       <el-table-column
@@ -143,6 +146,9 @@
           <div v-else-if="(scope.row.discountDifferenceAmount < 0 )" >
             <p><span :style="[setDownColor]">{{tool.formatAmount(scope.row.price,2)}}</span></p>
           </div>
+          <div v-else>
+            <p><span >{{tool.formatAmount(scope.row.price,2)}}</span></p>
+          </div>
         </template>
       </el-table-column>
       <el-table-column
@@ -160,7 +166,16 @@
           fixed="right"
           width="80">
         <template slot-scope="scope">
-          <span >{{scope.row.amount?tool.formatAmount(scope.row.amount,2):'--'}}</span>
+          <div v-if="(scope.row.discountDifferenceAmount > 0)">
+            <p><span :style="[setTopColor]">{{tool.formatAmount(scope.row.amount,2)}}</span></p>
+          </div>
+          <div v-else-if="(scope.row.discountDifferenceAmount < 0 )" >
+            <p><span :style="[setDownColor]">{{tool.formatAmount(scope.row.amount,2)}}</span></p>
+          </div>
+          <div v-else>
+            <p><span >{{tool.formatAmount(scope.row.amount,2)}}</span></p>
+          </div>
+<!--          <span >{{scope.row.amount?tool.formatAmount(scope.row.amount,2):'&#45;&#45;'}}</span>-->
         </template>
       </el-table-column>
       <el-table-column
@@ -169,7 +184,7 @@
           fixed="right"
           width="100">
         <template slot-scope="scope">
-          <i class="el-icon-check" v-if="scope.row.specialoffer === 1"  style="color: red;font-size: 20px"></i>
+          <i class="el-icon-check" v-if="scope.row.discountDifferenceAmount < 0"  style="color: red;font-size: 20px"></i>
           <p v-else>--</p>
         </template>
       </el-table-column>

src/template/orderCanUseProduct/index.vue

@@ -151,6 +151,9 @@ export default {
     },
     onConfirm () {
       this.$emit('onConfirm',this.tableSelectData)
+      this.tableSelectData.forEach(v => {
+        this.tableData.splice(this.tableData.findIndex(j => j.itemid == v.itemid),1)
+      })
     },
     clearSelection () {
       this.$refs.multipleTable.clearSelection();

src/template/product/index.vue

@@ -178,6 +178,7 @@ export default {
     },
     addProduct (row) {
       this.$emit('addProduct',row)
+      this.tableData.splice(this.tableData.findIndex(item => item.itemid == row.itemid),1)
     }
   },
   mounted () {