暂存

src/HDrpManagement/contractManage/modules/detail.vue

@@ -19,7 +19,7 @@
         <editBtn class="inline-16" :modelList="modelList" v-if="tool.checkAuth($route.name,'update')" :disabled="mainData.status != '新建' || !isLeader" @onSuccess="queryMainData();$refs.billno && $refs.billno.listData()" :data="mainData" />
         <submit-check class="inline-16"  :disabled="!isLeader" ref="submit" :data="mainData" @onSuccess="queryMainData" />
         <reverseCheck class="inline-16" @onSuccess="queryMainData()" :data="mainData" v-if="tool.checkAuth($route.name,'reverseCheck') && mainData.status === '审核'"  />
-        <revoke class="inline-16" @onSuccess="queryMainData()" :data="mainData" v-if="tool.checkAuth($route.name,'revoke') && mainData.status === '已提交'" ></revoke>
+        <revoke class="inline-16" @onSuccess="queryMainData()" :data="mainData" v-if="tool.checkAuth($route.name,'revoke') && mainData.status === '已提交' && isLeader" ></revoke>
         <contractOver class="inline-16" v-if="tool.checkAuth($route.name,'contractOver') && mainData.status != '已终止' && mainData.status != '审核' && isLeader" :disabled="!isLeader" :id="mainData.sa_contractid" @onSuccess="queryMainData" />
         <Del class="inline-16" :idName="20221121202502" :id="mainData.sa_contractid" idKey="sa_contractids"  v-if="tool.checkAuth($route.name,'toVoid') && mainData.status == '新建' && isLeader"/>
       </div>

src/HDrpManagement/projectChange/modules/modules/productSet/add.vue

@@ -262,11 +262,20 @@ export default {
     },
     /*修改商品数量*/
     numChange(val,index,data){
-      data.qty = val.toFixed(2)
+      console.log(val,index,data)
+
+      if (val < 0){
+        data.qty = 1
+      }else {
+        data.qty = Math.round(val *100)/100
+      }
+      data.totalPrice = Math.round((data.qty * data.marketprice) * 100) /100
+      this.$set(this.tableData,index,data)
+    /*  data.qty = val.toFixed(2)
       console.log(val,index)
       data.totalPrice = data.marketprice * data.qty
       console.log(data.marketprice,val,data.totalPrice)
-      this.$set(this.tableData,index,data)
+      this.$set(this.tableData,index,data)  */
     },
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);

src/HManagement/personalTarget/personalTargetStatistics/index.vue

@@ -565,7 +565,7 @@ export default {
           "row":this.tableData
         }
       })
-      window.open(res.msg)
+      window.open(res.data,'_self')
     },
     async yearList(){
       const res = await this.$api.requested({

src/HManagement/projectTarget/projectTargetStatistics/index.vue

@@ -574,7 +574,7 @@ export default {
           "row":this.tableData
         }
       })
-      window.open(res.msg)
+      window.open(res.data,'_self')
     },
     async yearList(){
       const res = await this.$api.requested({

src/HManagement/salesForecastTemplate/modules/add.vue

@@ -197,9 +197,11 @@ export default {
           "content": data
         })
         this.tool.showMessage(res,()=>{
-          this.$emit('onSuccess')
+         /* this.$emit('onSuccess')*/
           this.dialogFormVisible = false
-          this.refrehsh()
+          /*this.refrehsh()*/
+          this.$store.dispatch('changeDetailDrawer',true)
+          this.$router.push({path:'/salesForecastDetail',query:{id:res.data.sa_salesforecastmodelid,rowindex:res.data.rowindex}})
         })
       });
     },

src/SDrpManagement/QuotedPrice/components/edit/productTable.vue

@@ -29,7 +29,8 @@
               @selection-change="selectionChange">
             <el-table-column
                 type="selection"
-                width="55">
+                width="42"
+                fixed>
             </el-table-column>
             <el-table-column
                 align="center"
@@ -106,9 +107,10 @@
             <el-table-column
                 prop="marketprice"
                 label="牌价"
+                fixed="right"
                 width="100">
               <template slot-scope="scope">
-                  <span >{{scope.row.marketprice?scope.row.marketprice+',':'--'}}</span>
+                  <span >{{scope.row.marketprice?scope.row.marketprice:'--'}}</span>
               </template>
             </el-table-column>
             <el-table-column

src/SDrpManagement/QuotedPrice/components/edit/productTableProject.vue

@@ -29,7 +29,8 @@
               @selection-change="selectionChange">
             <el-table-column
                 type="selection"
-                width="55">
+                width="42"
+                fixed>
             </el-table-column>
             <el-table-column
                 align="center"
@@ -106,6 +107,7 @@
             <el-table-column
                 prop="marketprice"
                 label="牌价"
+                fixed="right"
                 width="100">
               <template slot-scope="scope">
                   <span >{{scope.row.marketprice?scope.row.marketprice+',':'--'}}</span>

src/SDrpManagement/QuotedPrice/components/edit/quotedPriceProduct.vue

@@ -27,12 +27,13 @@
           @selection-change="selectionChange">
         <el-table-column
             type="selection"
-            width="55">
+            width="42"
+            fixed>
         </el-table-column>
         <el-table-column
             align="center"
             label="产品图"
-            width="100">
+            width="80">
           <template slot-scope="scope">
             <div v-if="scope.row.attinfos[0]">
               <previewImage class="image" :image="scope.row.attinfos[0]" :list="scope.row.attinfos" :deletebtn="false"></previewImage>
@@ -114,9 +115,9 @@
             prop="num"
             label="数量"
             fixed="right"
-            width="180">
+            width="150">
           <template slot-scope="scope">
-            <el-input-number  v-model="scope.row.qty" size="mini" :min="1"  label="描述文字" @change="onChangeNum(scope.row.qty,scope.row,scope.$index)"></el-input-number>
+            <el-input-number   v-model="scope.row.qty" size="mini" :min="1"  label="描述文字" @change="onChangeNum(scope.row.qty,scope.row,scope.$index)"></el-input-number>
           </template>
         </el-table-column>
         <el-table-column
@@ -140,14 +141,14 @@
             prop="mindiscountrate"
             label="最低授权折扣(%)"
             fixed="right"
-            width="130">
+            width="80">
 <!--          <template slot-scope="scope">
             <el-input v-model="scope.row.discountrate" size="mini" placeholder="请输入最低授权折扣"></el-input>
           </template>-->
         </el-table-column>
         <el-table-column
           prop="price"
-          label="单价"
+          label="单价(元)"
           fixed="right"
           width="100">
           <template slot-scope="scope">
@@ -156,16 +157,16 @@
         </el-table-column>
         <el-table-column
             prop="discountDifferenceAmount"
-            label="授权折扣差额"
+            label="授权折扣差额(元)"
             fixed="right"
-            width="130">
+            width="80">
 <!--          <template slot-scope="scope">
             <el-input v-model="scope.row.discountrate" size="mini" placeholder="请输入授权折扣差额" ></el-input>
           </template>-->
         </el-table-column>
         <el-table-column
           prop="amount"
-          label="金额"
+          label="金额(元)"
           fixed="right"
           width="100">
           <template slot-scope="scope">
@@ -176,7 +177,7 @@
           prop="specialoffer"
           fixed="right"
           label="是否特价"
-          width="100">
+          width="60">
           <template slot-scope="scope">
             <i class="el-icon-check" v-if="scope.row.specialoffer === 1"  style="color: red;font-size: 20px"></i>
           </template>

src/SDrpManagement/QuotedPrice/components/productTable.vue

@@ -29,7 +29,8 @@
               @selection-change="selectionChange">
             <el-table-column
                 type="selection"
-                width="55">
+                width="42"
+                fixed>
             </el-table-column>
             <el-table-column
                 align="center"
@@ -106,6 +107,7 @@
             <el-table-column
                 prop="marketprice"
                 label="牌价"
+                fixed="right"
                 width="100">
               <template slot-scope="scope">
                   <span >{{scope.row.marketprice?scope.row.marketprice:'--'}}</span>

src/SDrpManagement/QuotedPrice/components/quotedPriceProduct.vue

@@ -27,7 +27,8 @@
           @selection-change="selectionChange">
         <el-table-column
             type="selection"
-            width="55">
+            width="42"
+            fixed>
         </el-table-column>
         <el-table-column
             align="center"
@@ -114,7 +115,7 @@
             prop="num"
             label="数量"
             fixed="right"
-            width="180">
+            width="150">
           <template slot-scope="scope">
             <el-input-number  v-model="scope.row.qty" size="mini"  :min="1" label="描述文字" @change="onChangeNum(scope.row.qty,scope.row,scope.$index)"></el-input-number>
           </template>
@@ -140,14 +141,14 @@
             prop="mindiscountrate"
             label="最低授权折扣(%)"
             fixed="right"
-            width="130">
+            width="80">
           <!--          <template slot-scope="scope">
                       <el-input v-model="scope.row.discountrate" size="mini" placeholder="请输入最低授权折扣"></el-input>
                     </template>-->
         </el-table-column>
         <el-table-column
           prop="price"
-          label="单价"
+          label="单价(元)"
           fixed="right"
           width="100">
           <template slot-scope="scope">
@@ -156,16 +157,16 @@
         </el-table-column>
         <el-table-column
             prop="discountDifferenceAmount"
-            label="授权折扣差额"
+            label="授权折扣差额(元)"
             fixed="right"
-            width="130">
+            width="80">
           <!--          <template slot-scope="scope">
                       <el-input v-model="scope.row.discountrate" size="mini" placeholder="请输入授权折扣差额" ></el-input>
                     </template>-->
         </el-table-column>
         <el-table-column
           prop="amount"
-          label="金额"
+          label="金额(元)"
           fixed="right"
           width="100">
           <template slot-scope="scope">
@@ -176,7 +177,7 @@
           prop="specialoffer"
           fixed="right"
           label="是否特价"
-          width="100">
+          width="60">
           <template slot-scope="scope">
             <i class="el-icon-check" v-if="scope.row.specialoffer === 1"  style="color: red;font-size: 20px"></i>
           </template>

src/SManagement/sales_forecast/modules/product.vue

@@ -69,6 +69,12 @@
         <el-tag size="mini" type="info" effect="plain">{{scope.row.unitname}}/{{scope.row.axunitname}}</el-tag>
       </template>
     </el-table-column>
+      <el-table-column
+          prop="marketprice"
+          label="牌价"
+          width="100"
+          fixed="right">
+      </el-table-column>
      <el-table-column
       label="数量"
       width="180"
@@ -77,16 +83,14 @@
         <el-input-number :disabled="!checkDateOut" :controls="true" :step-strictly="true" size="mini" v-model="scope.row.outqty" @change="qtyChange" label="输入数量"></el-input-number>
       </template>
     </el-table-column>
-    <el-table-column
-        prop="marketprice"
-        label="牌价"
-        width="100">
-    </el-table-column>
     <el-table-column
         prop="outamount"
         label="金额"
         width="100"
         fixed="right">
+<!--      <template slot-scope="scope">
+        <el-input :disabled="!checkDateOut" :controls="true" :step-strictly="true" size="mini" v-model="scope.row.outqty" @change="amountChange" label="输入金额"></el-input>
+      </template>-->
     </el-table-column>
     <el-table-column
         label="操作"
@@ -205,6 +209,46 @@ export default {
      
       
     },
+    /*amountChange (){
+      this.list = this.list.filter(e=>{
+        e.outamount = e.outqty * e.marketprice
+        return e
+      })
+      if(this.time !== null){
+        clearTimeout(this.time);
+      }
+      this.time = setTimeout(async () => {
+        const res = await this.$api.requested({
+          "id": 20220906155003,
+          "version":1,
+          "content": {
+            "sa_salesforecastmodelid":this.mainData.sa_salesforecastmodelid,
+            "sa_salesforecastbillid":this.$route.query.id,
+            "sa_projectid": this.param.content.where.sa_projectid,
+            "itemclassinfos": this.list.map(e=>{
+              return {
+                "sa_salesforecastid":e.sa_salesforecastid,
+                "itemclassnum": e.itemclassnum,
+                "orderqty": e.orderqty,
+                "orderamount": e.orderamount,
+                "invoiceqty": e.invoiceqty,
+                "invoiceamount": e.invoiceamount,
+                "outqty": e.outqty,
+                "outamount": e.outamount,
+                "itemid":e.itemid
+              }
+            })
+          }
+        })
+        console.log(this.param.content.where.sa_projectid)
+        this.listData(this.param.content.where.sa_projectid)
+        this.$emit('onSuccess',this.param.content.where.sa_projectid)
+        /!*this.tool.showMessage(res,()=>{
+          this.listData()
+          this.$emit('onSuccess')
+        })*!/
+      },1000)
+    },*/
     async deleteProduct (row) {
       const res = await this.$api.requested({
         "id": 20220906155103,