修改bug

src/HDrpManagement/contractManage/components/productDetailList/productDetailList.vue

@@ -26,7 +26,7 @@
         <template v-slot:customcol="scope">
           <div v-if="scope.column.columnname == 'qty'">
 <!--            <el-input-number size="mini" v-if="editIndex == scope.column.data.sa_contract_itemsid" v-model="scope.column.data.qty" @change="qtyChange" :min="1" label="描述文字"></el-input-number>-->
-            <el-input-number size="mini"  v-model="scope.column.data.qty" @change="qtyChange(scope.column.data.qty,scope.$index,scope.column.data)" :min="1" label="描述文字" :disabled="!tool.checkAuth($route.name,'productDetailManage') || data.status !== '新建' || !isLeader"></el-input-number>
+            <el-input-number size="mini"  v-model="scope.column.data.qty" @change="qtyChange(scope.column.data.qty,scope.$index,scope.column.data)" :min="scope.column.data.orderminqty" :step="scope.column.data.orderaddqty"  label="描述文字" :disabled="!tool.checkAuth($route.name,'productDetailManage') || data.status !== '新建' || !isLeader"></el-input-number>
           </div>
           <div v-else-if="scope.column.columnname == 'attinfos'">
             <previewImage

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

@@ -23,7 +23,7 @@
       <tableLayout checkbox="true" :layout="tablecols" :data="list" :width="true" :opwidth="200" height="calc(100vh - 550px)" :custom="true" fixedName="operation countPrice" @selectionChange="selectionChange">
         <template v-slot:customcol="scope">
           <div v-if="scope.column.columnname == 'qty'">
-            <el-input-number size="mini" v-model="scope.column.data.qty" @change="qtyChange($event,scope.column.data,scope.column.data.index)" :min="1" label="描述文字" :disabled="!tool.checkAuth($route.name,'productBillManage') || data.status !== '新建' || !isLeader"></el-input-number>
+            <el-input-number size="mini" v-model="scope.column.data.qty" @change="qtyChange($event,scope.column.data,scope.column.data.index)" :min="scope.column.data.orderminqty" :step="scope.column.data.orderaddqty" label="描述文字" :disabled="!tool.checkAuth($route.name,'productBillManage') || data.status !== '新建' || !isLeader"></el-input-number>
           </div>
           <div v-else-if="scope.column.columnname == 'attinfos'">
             <previewImage 

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

@@ -22,7 +22,7 @@
       <tableLayout checkbox="true" :layout="tablecols" :data="list" :opwidth="200" height="calc(100vh - 550px)" :custom="true" fixedName="operation  countPrice" @selectionChange="selectionChange">
         <template v-slot:customcol="scope">
           <div v-if="scope.column.columnname == 'qty'">
-            <el-input-number size="mini"  v-model="scope.column.data.qty" @change="qtyChange($event,scope.column.data,scope.column.data.index)" :min="1" label="描述文字" :disabled="!tool.checkAuth($route.name,'toolListManage') || data.status != '新建' || !isLeader"></el-input-number>
+            <el-input-number size="mini"  v-model="scope.column.data.qty" @change="qtyChange($event,scope.column.data,scope.column.data.index)" :min="scope.column.data.orderminqty" :step="scope.column.data.orderaddqty" label="描述文字" :disabled="!tool.checkAuth($route.name,'toolListManage') || data.status != '新建' || !isLeader"></el-input-number>
           </div>
           <div v-else-if="scope.column.columnname == 'attinfos'">
             <previewImage 

src/HDrpManagement/dispatch/modules/edit.vue

@@ -201,7 +201,7 @@ export default {
         "id": "20221009155903",
         "version":1,
         "content": {
-          "contactsid":row.contactsid
+          "contactsids":[row.contactsid]
         }
       })
       this.tool.showMessage(res,()=>{

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

@@ -63,8 +63,8 @@
         </template>
         <template v-slot:customcol="scope">
           <div v-if="scope.column.columnname === 'qty'">
-            <el-input-number :controls="true" controls-position='right' :step-strictly="true" v-if="data.status === '新建' && data.type !=='特殊订单'" size="mini" v-model="scope.column.data.qty" :min="scope.column.data.orderminqty" :step="scope.column.data.orderaddqty" label="输入数量" @change="rowChange(scope.column.data,scope.$index)"></el-input-number>
-            <el-input-number :controls="true" controls-position='right' :step-strictly="true" v-else-if="data.status === '新建' && data.type ==='特殊订单'" size="mini" v-model="scope.column.data.qty" label="输入数量" @change="rowChange(scope.column.data,scope.$index)"></el-input-number>
+            <el-input-number :controls="true" controls-position='right'  v-if="data.status === '新建' && data.type !=='特殊订单'" size="mini" v-model="scope.column.data.qty" :min="scope.column.data.orderminqty" :step="scope.column.data.orderaddqty" label="输入数量" @change="rowChange(scope.column.data,scope.$index)"></el-input-number>
+            <el-input-number :controls="true" controls-position='right'  v-else-if="data.status === '新建' && data.type ==='特殊订单'" size="mini" v-model="scope.column.data.qty" label="输入数量" @change="rowChange(scope.column.data,scope.$index)"></el-input-number>
             <span v-else>{{scope.column.data.qty}}</span>
           </div>
           <div v-else-if="scope.column.columnname === 'needdate'">
@@ -637,6 +637,7 @@ export default {
       }
       this.time = setTimeout(() => {
         this.$set(this.tableData,index,val)
+        console.log(this.tableData,'tableData')
         that.updateOrder({
           "sa_orderid": this.data.sa_orderid, //订单ID
           "sys_enterpriseid": this.data.sys_enterpriseid, //企业ID

src/HDrpManagement/orderManage/modules/edit.vue

@@ -225,9 +225,9 @@
                       <delete-btn 
                         message="确定删除当前地址吗?"
                         nameId="20221009155903" 
-                        nameKey="contactsid" 
+                        nameKey="contactsids"
                         :id="scope.row.contactsid"
-                        :isNumber="true"
+                        :isNumber="false"
                         @deleteSuccess="receiveAddress"
                       ></delete-btn>
                     </template>

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

@@ -36,7 +36,7 @@
       <tableLayout :layout="tablecols" checkbox="true"  :data="list" :opwidth="200" height="calc(100vh - 550px)" :width="true" :custom="true" fixedName="amount" @selectionChange="selectionChange">
         <template v-slot:customcol="scope">
           <div v-if="scope.column.columnname == 'qty'">
-            <el-input-number v-model="scope.column.data.qty" size="mini" :min="1"  label="描述文字" @change="numChange(scope.column.data.qty,scope.$index,scope.column.data)" :disabled="!disabled || !tool.checkAuth($route.name,'productSetManage')  "></el-input-number>
+            <el-input-number v-model="scope.column.data.qty" size="mini" :min="scope.column.data.orderminqty" :step="scope.column.data.orderaddqty"  label="描述文字" @change="numChange(scope.column.data.qty,scope.$index,scope.column.data)" :disabled="!disabled || !tool.checkAuth($route.name,'productSetManage')  "></el-input-number>
           </div>
           <div v-else-if="scope.column.columnname == 'price'">
             <el-input v-model="scope.column.data.price" size="mini"    @change="priceChange(scope.column.data.price,scope.$index,scope.column.data)" :disabled="!disabled || !tool.checkAuth($route.name,'productSetManage') "></el-input>

src/HManagement/marketing2/agent/details/modules/contact/list.vue

@@ -55,7 +55,7 @@ export default {
         "id": "20221009155903",
         "version":1,
         "content": {
-          "contactsid":row.contactsid
+          "contactsids":[row.contactsid]
         }
       })
       this.tool.showMessage(res,()=>{

src/HManagement/personalTarget/target/modules/edit/components/table.vue

@@ -34,11 +34,17 @@
           prop="y1l"
           label="基本"
           width="120">
+          <template slot-scope="scope">
+            <span>{{tool.formatAmount(scope.row.y1l,2)}}</span>
+          </template>
         </el-table-column>
         <el-table-column
           prop="y1h"
           label="挑战"
           width="120">
+          <template slot-scope="scope">
+            <span>{{tool.formatAmount(scope.row.y1h,2)}}</span>
+          </template>
         </el-table-column>
       </el-table-column>
       <el-table-column label="第一季度(万元)">
@@ -46,11 +52,17 @@
           prop="s1l"
           label="基本"
           width="120">
+          <template slot-scope="scope">
+            <span>{{tool.formatAmount(scope.row.s1l,2)}}</span>
+          </template>
         </el-table-column>
         <el-table-column
           prop="s1h"
           label="挑战"
           width="120">
+          <template slot-scope="scope">
+            <span>{{tool.formatAmount(scope.row.s1h,2)}}</span>
+          </template>
         </el-table-column>
       </el-table-column>
       <el-table-column label="一月(万元)">
@@ -58,11 +70,17 @@
           prop="m1l"
           label="基本"
           width="120">
+          <template slot-scope="scope">
+            <span>{{tool.formatAmount(scope.row.m1l,2)}}</span>
+          </template>
         </el-table-column>
         <el-table-column
           prop="m1h"
           label="挑战"
           width="120">
+          <template slot-scope="scope">
+            <span>{{tool.formatAmount(scope.row.m1h,2)}}</span>
+          </template>
         </el-table-column>
       </el-table-column>
       <el-table-column label="二月(万元)">
@@ -70,11 +88,17 @@
           prop="m2l"
           label="基本"
           width="120">
+          <template slot-scope="scope">
+            <span>{{tool.formatAmount(scope.row.m2l,2)}}</span>
+          </template>
         </el-table-column>
         <el-table-column
           prop="m2h"
           label="挑战"
           width="120">
+          <template slot-scope="scope">
+            <span>{{tool.formatAmount(scope.row.m2h,2)}}</span>
+          </template>
         </el-table-column>
       </el-table-column>
       <el-table-column label="三月(万元)">
@@ -82,11 +106,17 @@
           prop="m3l"
           label="基本"
           width="120">
+          <template slot-scope="scope">
+            <span>{{tool.formatAmount(scope.row.m3l,2)}}</span>
+          </template>
         </el-table-column>
         <el-table-column
           prop="m3h"
           label="挑战"
           width="120">
+          <template slot-scope="scope">
+            <span>{{tool.formatAmount(scope.row.m3h,2)}}</span>
+          </template>
         </el-table-column>
       </el-table-column>
       <el-table-column label="第二季度(万元)">
@@ -94,11 +124,17 @@
           prop="s2l"
           label="基本"
           width="120">
+          <template slot-scope="scope">
+            <span>{{tool.formatAmount(scope.row.s2l,2)}}</span>
+          </template>
         </el-table-column>
         <el-table-column
           prop="s2h"
           label="挑战"
           width="120">
+          <template slot-scope="scope">
+            <span>{{tool.formatAmount(scope.row.s2h,2)}}</span>
+          </template>
         </el-table-column>
       </el-table-column>
       <el-table-column label="四月(万元)">
@@ -106,11 +142,17 @@
           prop="m4l"
           label="基本"
           width="120">
+          <template slot-scope="scope">
+            <span>{{tool.formatAmount(scope.row.m4l,2)}}</span>
+          </template>
         </el-table-column>
         <el-table-column
           prop="m4h"
           label="挑战"
           width="120">
+          <template slot-scope="scope">
+            <span>{{tool.formatAmount(scope.row.m4h,2)}}</span>
+          </template>
         </el-table-column>
       </el-table-column>
       <el-table-column label="五月(万元)">
@@ -118,11 +160,17 @@
           prop="m5l"
           label="基本"
           width="120">
+          <template slot-scope="scope">
+            <span>{{tool.formatAmount(scope.row.m5l,2)}}</span>
+          </template>
         </el-table-column>
         <el-table-column
           prop="m5h"
           label="挑战"
           width="120">
+          <template slot-scope="scope">
+            <span>{{tool.formatAmount(scope.row.m5h,2)}}</span>
+          </template>
         </el-table-column>
       </el-table-column>
       <el-table-column label="六月(万元)">
@@ -130,11 +178,17 @@
           prop="m6l"
           label="基本"
           width="120">
+          <template slot-scope="scope">
+            <span>{{tool.formatAmount(scope.row.m6l,2)}}</span>
+          </template>
         </el-table-column>
         <el-table-column
           prop="m6h"
           label="挑战"
           width="120">
+          <template slot-scope="scope">
+            <span>{{tool.formatAmount(scope.row.m6h,2)}}</span>
+          </template>
         </el-table-column>
       </el-table-column>
       <el-table-column label="第三季度(万元)">
@@ -142,11 +196,17 @@
           prop="s3l"
           label="基本"
           width="120">
+          <template slot-scope="scope">
+            <span>{{tool.formatAmount(scope.row.s3l,2)}}</span>
+          </template>
         </el-table-column>
         <el-table-column
           prop="s3h"
           label="挑战"
           width="120">
+          <template slot-scope="scope">
+            <span>{{tool.formatAmount(scope.row.s3h,2)}}</span>
+          </template>
         </el-table-column>
       </el-table-column>
       <el-table-column label="七月(万元)">
@@ -154,11 +214,17 @@
           prop="m7l"
           label="基本"
           width="120">
+          <template slot-scope="scope">
+            <span>{{tool.formatAmount(scope.row.m7l,2)}}</span>
+          </template>
         </el-table-column>
         <el-table-column
           prop="m7h"
           label="挑战"
           width="120">
+          <template slot-scope="scope">
+            <span>{{tool.formatAmount(scope.row.m7h,2)}}</span>
+          </template>
         </el-table-column>
       </el-table-column>
       <el-table-column label="八月(万元)">
@@ -166,11 +232,17 @@
           prop="m8l"
           label="基本"
           width="120">
+          <template slot-scope="scope">
+            <span>{{tool.formatAmount(scope.row.m8l,2)}}</span>
+          </template>
         </el-table-column>
         <el-table-column
           prop="m8h"
           label="挑战"
           width="120">
+          <template slot-scope="scope">
+            <span>{{tool.formatAmount(scope.row.m8h,2)}}</span>
+          </template>
         </el-table-column>
       </el-table-column>
       <el-table-column label="九月(万元)">
@@ -178,11 +250,17 @@
           prop="m9l"
           label="基本"
           width="120">
+          <template slot-scope="scope">
+            <span>{{tool.formatAmount(scope.row.m9l,2)}}</span>
+          </template>
         </el-table-column>
         <el-table-column
           prop="m9h"
           label="挑战"
           width="120">
+          <template slot-scope="scope">
+            <span>{{tool.formatAmount(scope.row.m9h,2)}}</span>
+          </template>
         </el-table-column>
       </el-table-column>
       <el-table-column label="第四季度(万元)">
@@ -190,11 +268,17 @@
           prop="s4l"
           label="基本"
           width="120">
+          <template slot-scope="scope">
+            <span>{{tool.formatAmount(scope.row.s4l,2)}}</span>
+          </template>
         </el-table-column>
         <el-table-column
           prop="s4h"
           label="挑战"
           width="120">
+          <template slot-scope="scope">
+            <span>{{tool.formatAmount(scope.row.s4h,2)}}</span>
+          </template>
         </el-table-column>
       </el-table-column>
       <el-table-column label="十月(万元)">
@@ -202,11 +286,17 @@
           prop="m10l"
           label="基本"
           width="120">
+          <template slot-scope="scope">
+            <span>{{tool.formatAmount(scope.row.m10l,2)}}</span>
+          </template>
         </el-table-column>
         <el-table-column
           prop="m10h"
           label="挑战"
           width="120">
+          <template slot-scope="scope">
+            <span>{{tool.formatAmount(scope.row.m10h,2)}}</span>
+          </template>
         </el-table-column>
       </el-table-column>
       <el-table-column label="十一月(万元)">
@@ -214,11 +304,17 @@
           prop="m11l"
           label="基本"
           width="120">
+          <template slot-scope="scope">
+            <span>{{tool.formatAmount(scope.row.m11l,2)}}</span>
+          </template>
         </el-table-column>
         <el-table-column
           prop="m11h"
           label="挑战"
           width="120">
+          <template slot-scope="scope">
+            <span>{{tool.formatAmount(scope.row.m11h,2)}}</span>
+          </template>
         </el-table-column>
       </el-table-column>
       <el-table-column label="十二月(万元)">
@@ -226,11 +322,17 @@
           prop="m12l"
           label="基本"
           width="120">
+          <template slot-scope="scope">
+            <span>{{tool.formatAmount(scope.row.m12l,2)}}</span>
+          </template>
         </el-table-column>
         <el-table-column
           prop="m12h"
           label="挑战"
           width="120">
+          <template slot-scope="scope">
+            <span>{{tool.formatAmount(scope.row.m12h,2)}}</span>
+          </template>
         </el-table-column>
       </el-table-column>
        <el-table-column label="操作" fixed="right" width="100">

src/HManagement/projectTarget/target/modules/edit/components/table.vue

@@ -52,11 +52,17 @@
           prop="y1l"
           label="基本"
           width="120">
+          <template slot-scope="scope">
+            <span>{{tool.formatAmount(scope.row.y1l,2)}}</span>
+          </template>
         </el-table-column>
         <el-table-column
           prop="y1h"
           label="挑战"
           width="120">
+          <template slot-scope="scope">
+            <span>{{tool.formatAmount(scope.row.y1h,2)}}</span>
+          </template>
         </el-table-column>
       </el-table-column>
       <el-table-column label="第一季度(万元)">
@@ -64,11 +70,17 @@
           prop="s1l"
           label="基本"
           width="120">
+          <template slot-scope="scope">
+            <span>{{tool.formatAmount(scope.row.s1l,2)}}</span>
+          </template>
         </el-table-column>
         <el-table-column
           prop="s1h"
           label="挑战"
           width="120">
+          <template slot-scope="scope">
+            <span>{{tool.formatAmount(scope.row.s1h,2)}}</span>
+          </template>
         </el-table-column>
       </el-table-column>
       <el-table-column label="一月(万元)">
@@ -76,11 +88,17 @@
           prop="m1l"
           label="基本"
           width="120">
+          <template slot-scope="scope">
+            <span>{{tool.formatAmount(scope.row.m1l,2)}}</span>
+          </template>
         </el-table-column>
         <el-table-column
           prop="m1h"
           label="挑战"
           width="120">
+          <template slot-scope="scope">
+            <span>{{tool.formatAmount(scope.row.m1h,2)}}</span>
+          </template>
         </el-table-column>
       </el-table-column>
       <el-table-column label="二月(万元)">
@@ -88,11 +106,17 @@
           prop="m2l"
           label="基本"
           width="120">
+          <template slot-scope="scope">
+            <span>{{tool.formatAmount(scope.row.m2l,2)}}</span>
+          </template>
         </el-table-column>
         <el-table-column
           prop="m2h"
           label="挑战"
           width="120">
+          <template slot-scope="scope">
+            <span>{{tool.formatAmount(scope.row.m2h,2)}}</span>
+          </template>
         </el-table-column>
       </el-table-column>
       <el-table-column label="三月(万元)">
@@ -100,11 +124,17 @@
           prop="m3l"
           label="基本"
           width="120">
+          <template slot-scope="scope">
+            <span>{{tool.formatAmount(scope.row.m3l,2)}}</span>
+          </template>
         </el-table-column>
         <el-table-column
           prop="m3h"
           label="挑战"
           width="120">
+          <template slot-scope="scope">
+            <span>{{tool.formatAmount(scope.row.m3h,2)}}</span>
+          </template>
         </el-table-column>
       </el-table-column>
       <el-table-column label="第二季度(万元)">
@@ -112,11 +142,17 @@
           prop="s2l"
           label="基本"
           width="120">
+          <template slot-scope="scope">
+            <span>{{tool.formatAmount(scope.row.s2l,2)}}</span>
+          </template>
         </el-table-column>
         <el-table-column
           prop="s2h"
           label="挑战"
           width="120">
+          <template slot-scope="scope">
+            <span>{{tool.formatAmount(scope.row.s2h,2)}}</span>
+          </template>
         </el-table-column>
       </el-table-column>
       <el-table-column label="四月(万元)">
@@ -124,11 +160,17 @@
           prop="m4l"
           label="基本"
           width="120">
+          <template slot-scope="scope">
+            <span>{{tool.formatAmount(scope.row.m4l,2)}}</span>
+          </template>
         </el-table-column>
         <el-table-column
           prop="m4h"
           label="挑战"
           width="120">
+          <template slot-scope="scope">
+            <span>{{tool.formatAmount(scope.row.m4h,2)}}</span>
+          </template>
         </el-table-column>
       </el-table-column>
       <el-table-column label="五月(万元)">
@@ -136,11 +178,17 @@
           prop="m5l"
           label="基本"
           width="120">
+          <template slot-scope="scope">
+            <span>{{tool.formatAmount(scope.row.m5l,2)}}</span>
+          </template>
         </el-table-column>
         <el-table-column
           prop="m5h"
           label="挑战"
           width="120">
+          <template slot-scope="scope">
+            <span>{{tool.formatAmount(scope.row.m5h,2)}}</span>
+          </template>
         </el-table-column>
       </el-table-column>
       <el-table-column label="六月(万元)">
@@ -148,11 +196,17 @@
           prop="m6l"
           label="基本"
           width="120">
+          <template slot-scope="scope">
+            <span>{{tool.formatAmount(scope.row.m6l,2)}}</span>
+          </template>
         </el-table-column>
         <el-table-column
           prop="m6h"
           label="挑战"
           width="120">
+          <template slot-scope="scope">
+            <span>{{tool.formatAmount(scope.row.m6h,2)}}</span>
+          </template>
         </el-table-column>
       </el-table-column>
       <el-table-column label="第三季度(万元)">
@@ -160,11 +214,17 @@
           prop="s3l"
           label="基本"
           width="120">
+          <template slot-scope="scope">
+            <span>{{tool.formatAmount(scope.row.s3l,2)}}</span>
+          </template>
         </el-table-column>
         <el-table-column
           prop="s3h"
           label="挑战"
           width="120">
+          <template slot-scope="scope">
+            <span>{{tool.formatAmount(scope.row.s3h,2)}}</span>
+          </template>
         </el-table-column>
       </el-table-column>
       <el-table-column label="七月(万元)">
@@ -172,11 +232,17 @@
           prop="m7l"
           label="基本"
           width="120">
+          <template slot-scope="scope">
+            <span>{{tool.formatAmount(scope.row.m7l,2)}}</span>
+          </template>
         </el-table-column>
         <el-table-column
           prop="m7h"
           label="挑战"
           width="120">
+          <template slot-scope="scope">
+            <span>{{tool.formatAmount(scope.row.m7h,2)}}</span>
+          </template>
         </el-table-column>
       </el-table-column>
       <el-table-column label="八月(万元)">
@@ -184,11 +250,17 @@
           prop="m8l"
           label="基本"
           width="120">
+          <template slot-scope="scope">
+            <span>{{tool.formatAmount(scope.row.m8l,2)}}</span>
+          </template>
         </el-table-column>
         <el-table-column
           prop="m8h"
           label="挑战"
           width="120">
+          <template slot-scope="scope">
+            <span>{{tool.formatAmount(scope.row.m8h,2)}}</span>
+          </template>
         </el-table-column>
       </el-table-column>
       <el-table-column label="九月(万元)">
@@ -196,11 +268,17 @@
           prop="m9l"
           label="基本"
           width="120">
+          <template slot-scope="scope">
+            <span>{{tool.formatAmount(scope.row.m9l,2)}}</span>
+          </template>
         </el-table-column>
         <el-table-column
           prop="m9h"
           label="挑战"
           width="120">
+          <template slot-scope="scope">
+            <span>{{tool.formatAmount(scope.row.m9h,2)}}</span>
+          </template>
         </el-table-column>
       </el-table-column>
       <el-table-column label="第四季度(万元)">
@@ -208,11 +286,17 @@
           prop="s4l"
           label="基本"
           width="120">
+          <template slot-scope="scope">
+            <span>{{tool.formatAmount(scope.row.s4l,2)}}</span>
+          </template>
         </el-table-column>
         <el-table-column
           prop="s4h"
           label="挑战"
           width="120">
+          <template slot-scope="scope">
+            <span>{{tool.formatAmount(scope.row.s4h,2)}}</span>
+          </template>
         </el-table-column>
       </el-table-column>
       <el-table-column label="十月(万元)">
@@ -220,11 +304,17 @@
           prop="m10l"
           label="基本"
           width="120">
+          <template slot-scope="scope">
+            <span>{{tool.formatAmount(scope.row.m10l,2)}}</span>
+          </template>
         </el-table-column>
         <el-table-column
           prop="m10h"
           label="挑战"
           width="120">
+          <template slot-scope="scope">
+            <span>{{tool.formatAmount(scope.row.m10h,2)}}</span>
+          </template>
         </el-table-column>
       </el-table-column>
       <el-table-column label="十一月(万元)">
@@ -232,11 +322,17 @@
           prop="m11l"
           label="基本"
           width="120">
+          <template slot-scope="scope">
+            <span>{{tool.formatAmount(scope.row.m11l,2)}}</span>
+          </template>
         </el-table-column>
         <el-table-column
           prop="m11h"
           label="挑战"
           width="120">
+          <template slot-scope="scope">
+            <span>{{tool.formatAmount(scope.row.m11h,2)}}</span>
+          </template>
         </el-table-column>
       </el-table-column>
       <el-table-column label="十二月(万元)">
@@ -244,11 +340,17 @@
           prop="m12l"
           label="基本"
           width="120">
+          <template slot-scope="scope">
+            <span>{{tool.formatAmount(scope.row.m12l,2)}}</span>
+          </template>
         </el-table-column>
         <el-table-column
           prop="m12h"
           label="挑战"
           width="120">
+          <template slot-scope="scope">
+            <span>{{tool.formatAmount(scope.row.m12h,2)}}</span>
+          </template>
         </el-table-column>
       </el-table-column>
 <!--      <div  class="container normal-panel" style="text-align:right">

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

@@ -41,7 +41,7 @@
       <tableLayout :layout="tablecols" checkbox="true"  :data="list" :opwidth="200" height="calc(100vh - 550px)" :width="true" :custom="true" fixedName="offerPrice amount" @selectionChange="selectionChange">
         <template v-slot:customcol="scope">
           <div v-if="scope.column.columnname == 'qty'">
-            <el-input-number v-model="scope.column.data.qty" size="mini"  :min="1" label="描述文字" @change="onChangeNum(scope.column.data.qty,scope.column.data,scope.$index)"></el-input-number>
+            <el-input-number :disabled="data.status !== '新建' || !tool.checkAuth($route.name,'productDetails') || !disabled" v-model="scope.column.data.qty" size="mini"  :min="scope.column.data.orderminqty" :step="scope.column.data.orderaddqty"  label="描述文字" @change="onChangeNum(scope.column.data.qty,scope.column.data,scope.$index)"></el-input-number>
           </div>
           <div v-else-if="scope.column.columnname == 'discountrate'" >
             <el-input  :disabled="data.status !== '新建' || !tool.checkAuth($route.name,'productDetails') || !disabled"  v-model="scope.column.data.discountrate" size="mini" placeholder="请输入折扣" @change="onChangeDiscountrate(scope.column.data.discountrate,scope.column.data,scope.$index)"></el-input>

src/SDrpManagement/QuotedPrice/index.vue

@@ -7,13 +7,14 @@
         idName="sa_quotedpriceid"
         :apiId="{query:20221020165103,del:20221020165503}"
         :options="options"
+        :isExport="false"
         :autoQuery="false"
         :specialKey="[{key:'leader',value:'name'},{key:'tag_sys',value:null},{key:'industry',value:null}]"
         :detail-path="{path:'/quotedPriceDetail'}"
       >
-      <div slot="titleRight">
-<!--        <importExcel style="margin-left:10px" @onSuccess="onSuccess"></importExcel>-->
-      </div>
+      <template #titleRight>
+        <el-button type="primary" size="small" @click="onExport" plain>导 出</el-button>
+      </template>
       <template #custom >
         <div class="mt-10">
           <label  class="search__label" >范围:</label>
@@ -247,6 +248,24 @@ export default {
         }
       }
       this.selectChange()
+    },
+    async onExport(){
+      const res = await this.$api.requested({
+        "id": 20221020165103,
+        "content": {
+          "type":this.tabName,
+          "pageNumber": 1,
+          "pageSize": 20,
+          "isAll":1,
+          "isExport":1,//0：不导出，1：导出
+          "where": {
+            "condition": "",
+            "startdate": "",
+            "enddate": ""
+          }
+        },
+      })
+      window.open(res.data,'_self')
     }
   },
   mounted() {

src/SDrpManagement/agentOrder/modules/edit.vue

@@ -225,9 +225,9 @@
                       <delete-btn 
                         message="确定删除当前地址吗?"
                         nameId="20221009155903" 
-                        nameKey="contactsid" 
+                        nameKey="contactsids"
                         :id="scope.row.contactsid"
-                        :isNumber="true"
+                        :isNumber="false"
                         @deleteSuccess="receiveAddress"
                       ></delete-btn>
                     </template>

src/SDrpManagement/salerOrder/modules/edit.vue

@@ -216,9 +216,9 @@
                       <delete-btn 
                         message="确定删除当前地址吗?"
                         nameId="20221009155903" 
-                        nameKey="contactsid" 
+                        nameKey="contactsids"
                         :id="scope.row.contactsid"
-                        :isNumber="true"
+                        :isNumber="false"
                         @deleteSuccess="receiveAddress"
                       ></delete-btn>
                     </template>
@@ -396,6 +396,10 @@ export default {
     this.queryBasicInfo()
   },
   methods:{
+    enterprisePageChange (n) {
+      this.enterpriseParam.content.pageNumber = n
+      this.getEnterpriseList()
+    },
     addresPageChange (n) {
       this.addressparam.content.pageNumber = n
       this.receiveAddress()

src/SDrpManagement/salerOrder/modules/productlist.vue

@@ -46,8 +46,7 @@
       <template v-slot:customcol="scope">
         <div v-if="scope.column.columnname === 'qty'">
           <el-input-number 
-            :controls="true" controls-position='right' 
-            :step-strictly="true" 
+            :controls="true" controls-position='right'
             v-if="data.status === '新建' && data.type != '特殊订单'" 
             size="mini" v-model="scope.column.data.qty" :min="scope.column.data.orderminqty" :step="scope.column.data.orderaddqty" label="输入数量" @change="qtyChange(scope.column.data,scope.$index)"></el-input-number>
           <span v-else>{{scope.column.data.qty}}</span>

src/SDrpManagement/salerPrivatecustomer/index.vue

@@ -7,9 +7,13 @@
       idName="sa_customersid"
       :apiId="{query:20221012164402,del:''}"
       :autoQuery="false"
+      :isExport="false"
       :specialKey="[{key:'leader',value:'name'},{key:'tag_sys',value:null},{key:'industry',value:null}]"
       :detailPath="{path:'/customerDetail',param:{tabIndex:tabIndex}}"
      >
+      <template #titleRight>
+        <el-button type="primary" size="small" @click="onExport" plain>导 出</el-button>
+      </template>
       <template #custom>
         <div class="mt-10">
           <label class="search__label">范围:</label>
@@ -360,6 +364,26 @@ export default {
         }
       }
       this.queryData(this.value)
+    },
+    async onExport(){
+      const res = await this.$api.requested({
+        "id": 20221012164402,
+        "content": {
+          "type":this.value,
+          "pageNumber": 1,
+          "pageSize": 20,
+          "deleted":0,
+          "isend":0,
+          "isAll":1,
+          "isExport":1,//0：不导出，1：导出
+          "where": {
+            "condition": "",
+            "startdate": "",
+            "enddate": ""
+          }
+        },
+      })
+      window.open(res.data,'_self')
     }
   },
   created() {

src/SManagement/project_target/modules/detailInfo.vue

@@ -40,6 +40,9 @@
         </template>-->
         <template v-slot:customcol="scope">
           <el-input size="mini" v-if="(scope.column.columnname === 'target_l' || scope.column.columnname === 'target_h' ) && actindex === scope.column.data.rowindex" v-model="scope.column.data[scope.column.columnname]"></el-input>
+          <span size="mini" v-else-if="(scope.column.columnname === 'target_l' || scope.column.columnname === 'target_h' ) && actindex !== scope.column.data.rowindex" >
+            {{tool.formatAmount(scope.column.data[scope.column.columnname],2)}}
+          </span>
           <div v-else-if="scope.column.columnname === 'point'">
             <el-date-picker
                 v-if="actindex === scope.column.data.rowindex"
@@ -67,8 +70,8 @@
             <label class="search__label">项目总数：</label>
             {{total}}</div>-->
           <div style="float: left;margin-left: -40px">
-            <label class="search__label" style="width: 160px">项目基本目标(万元)：</label>{{target_l}}</div>
-          <div style="float: left;margin-left: 20px" ><label class="search__label" style="width: 160px">项目挑战目标(万元)：</label>{{target_h}}</div>
+            <label class="search__label" style="width: 160px">项目基本目标(万元)：</label>{{tool.formatAmount(target_l,2)}}</div>
+          <div style="float: left;margin-left: 20px" ><label class="search__label" style="width: 160px">项目挑战目标(万元)：</label>{{tool.formatAmount(target_h,2)}}</div>
           <el-pagination
               background
               small

src/SManagement/sales_forecast/modules/product.vue

@@ -11,7 +11,7 @@
           <el-input :disabled="!checkDateOut" size="mini" v-model="scope.column.data.price" @change="priceChange"></el-input>
         </div>
         <div v-else-if="scope.column.columnname == 'outqty'">
-          <el-input-number :disabled="!checkDateOut" :controls="true" :step-strictly="true" size="mini" v-model="scope.column.data.outqty" @change="qtyChange" label="输入数量"></el-input-number>
+          <el-input-number :disabled="!checkDateOut" :controls="true" :step-strictly="true" size="mini" v-model="scope.column.data.outqty" :min="scope.column.data.orderminqty" :step="scope.column.data.orderaddqty"  @change="qtyChange" label="输入数量"></el-input-number>
         </div>
         <div v-else-if="scope.column.columnname == 'marketprice'">
           <p>{{tool.formatAmount((scope.column.data.marketprice),2)}}</p>

src/SManagement/setenterpriseInfo/modules/address/list.vue

@@ -57,7 +57,7 @@ export default {
         "id": "20221009155903",
         "version":1,
         "content": {
-          "contactsid":row.contactsid
+          "contactsids":[row.contactsid]
         }
       })
       this.tool.showMessage(res,()=>{

src/template/addProduct/index.vue

@@ -65,7 +65,10 @@
         <div >
           <tableTemp :data="list" :layout="tablecolsAdd" :opwidth="200" :custom="true" height="calc(100vh - 370px)" @checkboxCallBack="checkboxCallBack" fixedName="operation">
             <template v-slot:customcol="scope">
-              <p >{{scope.column.data[scope.column.columnname]}}</p>
+              <p v-if="scope.column.columnname === 'cover'">
+                <previewImage v-if="scope.column.data.attinfos[0]" class="image" :image="scope.column.data.attinfos[0]" :list="scope.column.data.attinfos" :deletebtn="false"></previewImage>
+              </p>
+              <p v-else>{{scope.column.data[scope.column.columnname]}}</p>
             </template>
             <template v-slot:opreation="scope">
               <el-button type="text" size="mini" @click="addProduct(scope)">添 加</el-button>
@@ -92,11 +95,11 @@
 <script>
 import tableTemp from './table'
 import uploadAllData from '@/components/uploadAllData/index'
-
+import previewImage from '@/components/previewImage/index'
 export default {
   name: "index",
   props:["data","tradefield","discountrate","params","title","tablecolsAdd","sa_projectid","querySa_brandid"],
-  components:{tableTemp,uploadAllData},
+  components:{tableTemp,uploadAllData,previewImage},
   data(){
     return {
       dialogFormVisible:false,
@@ -299,6 +302,11 @@ export default {
 </script>
 
 <style scoped>
+  .image{
+  height: 38px;
+  width: 38px;
+  margin-top:0;
+  }
   .top-margin{
     margin-top: 20px;
   }

src/template/addProductContract/index.vue

@@ -148,6 +148,9 @@
                   </span>
                 </span>
               </div>
+              <p v-else-if="scope.column.columnname === 'cover'">
+                <previewImage v-if="scope.column.data.attinfos[0]" class="image" :image="scope.column.data.attinfos[0]" :list="scope.column.data.attinfos" :deletebtn="false"></previewImage>
+              </p>
               <p v-else>{{scope.column.data[scope.column.columnname]}}</p>
             </template>
             <template v-slot:opreation="scope">
@@ -175,11 +178,11 @@
 <script>
 import tableTemp from './table'
 import uploadAllData from '@/components/uploadAllData/index'
-
+import previewImage from '@/components/previewImage/index'
 export default {
   name: "index",
   props:["data","tradefield","discountrate","title","tablecolsAdd","sa_projectid","querySa_brandid"],
-  components:{tableTemp,uploadAllData},
+  components:{tableTemp,uploadAllData,previewImage},
   data(){
     return {
       billno:'',
@@ -402,6 +405,11 @@ export default {
 </script>
 
 <style scoped>
+  .image{
+    height: 38px;
+    width: 38px;
+    margin-top:0;
+  }
   .top-margin{
     margin-top: 20px;
   }

src/template/addTool/index.vue

@@ -29,7 +29,10 @@
         <div >
           <tableTemp :data="list" :layout="tablecolsAdd" :opwidth="200" :custom="true" height="calc(100vh - 370px)" @checkboxCallBack="checkboxCallBack" fixedName="operation">
             <template v-slot:customcol="scope">
-              <p >{{scope.column.data[scope.column.columnname]}}</p>
+              <p v-if="scope.column.columnname === 'cover'">
+                <previewImage v-if="scope.column.data.attinfos[0]" class="image" :image="scope.column.data.attinfos[0]" :list="scope.column.data.attinfos" :deletebtn="false"></previewImage>
+              </p>
+              <p v-else>{{scope.column.data[scope.column.columnname]}}</p>
             </template>
             <template v-slot:opreation="scope">
               <el-button type="text" size="mini" @click="addProduct(scope)">添 加</el-button>
@@ -56,11 +59,11 @@
 <script>
 import tableTemp from './table'
 import uploadAllData from '@/components/uploadAllData/index'
-
+import previewImage from '@/components/previewImage/index'
 export default {
   name: "index",
   props:["data","tradefield","discountrate","params","title","tablecolsAdd","sa_projectid","querySa_brandid"],
-  components:{tableTemp,uploadAllData},
+  components:{tableTemp,uploadAllData,previewImage},
   data(){
     return {
       dialogFormVisible:false,
@@ -147,6 +150,11 @@ export default {
 </script>
 
 <style scoped>
+  .image{
+    height: 38px;
+    width: 38px;
+    margin-top:0;
+  }
   .top-margin{
     margin-top: 20px;
   }

src/utils/tool.js

@@ -54,6 +54,7 @@ export default {
   /* 获取基本地址 */
   getBaseUrl () {
     if (process.env.NODE_ENV == 'development') return 'https://oms.idcgroup.com.cn:8079'
+    // if (process.env.NODE_ENV == 'development') return '/apis'
     let href = window.location.href
     let index = href.indexOf('/')
     let num = 0

vue.config.js

@@ -15,7 +15,7 @@ module.exports = {
       proxy: {
         '/apis': {
           // target: 'http://61.164.207.46:8000',  // target host*/
-          target: 'http://192.168.3.9:8090',  // target host*!
+          target: 'http://192.168.3.9:8080',  // target host*!
           // target: 'https://oms.idcgroup.com.cn:8079/',  // target host
           // target: 'localhost:8080',  // target host
           ws: true,  // proxy websockets