Merge branch 'test' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-wt into test

src/views/bpm/handleTask/components/financialManage/invoiceManage/components/purchasingAccountTable.vue

@@ -8,8 +8,8 @@
             <span>采购订单：</span>
             <span>{{ item.orderNo }}</span>
             <el-divider direction="vertical"></el-divider>
-            <span>计价方式：</span>
-            <span> {{ item.pricingWay == 1 ? '按数量计费' : '按重量计费' }}</span>
+            <!-- <span>计价方式：</span>
+            <span> {{ item.pricingWay == 1 ? '按数量计费' : '按重量计费' }}</span> -->
             <el-divider direction="vertical"></el-divider>
             <span>总金额：</span>
             <span>{{item.amountTotalPrice}}</span>

src/views/bpm/handleTask/components/financialManage/invoiceManage/components/saleAccountTable.vue

@@ -8,8 +8,8 @@
             <span>销售订单：</span>
             <span>{{ item.orderNo }}</span>
             <el-divider direction="vertical"></el-divider>
-            <span>计价方式：</span>
-            <span> {{ item.pricingWay == 1 ? '按数量计费' : '按重量计费' }}</span>
+            <!-- <span>计价方式：</span>
+            <span> {{ item.pricingWay == 1 ? '按数量计费' : '按重量计费' }}</span> -->
             <el-divider direction="vertical"></el-divider>
             <span>总金额：</span>
             <span>{{ item.amountTotalPrice }}</span>

src/views/bpm/handleTask/components/purchaseOrder/addDialog.vue

@@ -54,7 +54,7 @@
             />
           </el-form-item>
 
-          <el-form-item
+          <!-- <el-form-item
             label="计价方式"
             prop="pricingWay"
             style="margin-bottom: 22px"
@@ -68,7 +68,7 @@
                 item.name
               }}</el-radio>
             </el-radio-group>
-          </el-form-item>
+          </el-form-item> -->
         </el-col>
         <el-col :span="12">
           <el-form-item

src/views/bpm/handleTask/components/purchaseOrder/outSourceSend/addOrEditDialog.vue

@@ -49,7 +49,7 @@
         </el-col>
       </el-row>
       <el-row :gutter="20">
-        <el-col :span="12">
+        <!-- <el-col :span="12">
           <el-form-item
             label="计价方式"
             style="margin-bottom: 22px">
@@ -58,7 +58,7 @@
               <el-option label="按重量计费" :value="2"></el-option>
             </el-select>
           </el-form-item>
-        </el-col>
+        </el-col> -->
         <el-col :span="12">
           <el-form-item
             label="外协单位电话"

src/views/bpm/handleTask/components/purchaseOrder/outSourceSendCk/addOrEditDialog.vue

@@ -49,7 +49,7 @@
         </el-col>
       </el-row>
       <el-row :gutter="20">
-        <el-col :span="12">
+        <!-- <el-col :span="12">
           <el-form-item
             label="计价方式"
             style="margin-bottom: 22px">
@@ -58,7 +58,7 @@
               <el-option label="按重量计费" :value="2"></el-option>
             </el-select>
           </el-form-item>
-        </el-col>
+        </el-col> -->
         <el-col :span="12">
           <el-form-item
             label="外协单位电话"

src/views/bpm/handleTask/components/purchaseOrder/outsourceSendReturnGoods/addReturnGoodsDialog.vue

@@ -73,14 +73,14 @@
             <el-input clearable v-model="form.linkPhone" placeholder="请输入" />
             <!-- {{ form.linkPhone }} -->
           </el-form-item>
-          <el-form-item
+          <!-- <el-form-item
             label="计价方式"
             style="margin-bottom: 22px">
             <el-select v-model="form.pricingWay" disabled style="width: 100%">
               <el-option label="按数量计费" :value="1"></el-option>
               <el-option label="按重量计费" :value="2"></el-option>
             </el-select>
-          </el-form-item>
+          </el-form-item> -->
         </el-col>
       </el-row>
       <headerTitle title="物品清单" style="margin-top: 30px"></headerTitle>

src/views/bpm/handleTask/components/purchaseOrder/returnGoods/addReturnGoodsDialog.vue

@@ -73,14 +73,14 @@
             <el-input clearable v-model="form.linkPhone" placeholder="请输入" />
             <!-- {{ form.linkPhone }} -->
           </el-form-item>
-          <el-form-item
+          <!-- <el-form-item
             label="计价方式"
             style="margin-bottom: 22px">
             <el-select v-model="form.pricingWay" disabled style="width: 100%">
               <el-option label="按数量计费" :value="1"></el-option>
               <el-option label="按重量计费" :value="2"></el-option>
             </el-select>
-          </el-form-item>
+          </el-form-item> -->
         </el-col>
       </el-row>
       <headerTitle title="物品清单" style="margin-top: 30px"></headerTitle>

src/views/bpm/handleTask/components/saleOrder/addDialog.vue

@@ -107,14 +107,14 @@
             >
             </DictSelection>
           </el-form-item>
-          <el-form-item
+          <!-- <el-form-item
             label="计价方式"
             prop="pricingWay"
             >
             <el-radio-group v-model="form.pricingWay" @change="changePricingWay" :disabled="!!form.contractId">
               <el-radio v-for="item in pricingWayList" :label="item.id">{{ item.name }}</el-radio>
             </el-radio-group>
-          </el-form-item>
+          </el-form-item> -->
 
         </el-col>
 

src/views/bpm/handleTask/components/saleOrder/entrustedReceive/addOrEditDialog.vue

@@ -29,7 +29,7 @@
         </el-col>
       </el-row>
       <el-row :gutter="20">
-        <el-col :span="12">
+        <!-- <el-col :span="12">
           <el-form-item
             label="计价方式"
             style="margin-bottom: 22px">
@@ -38,7 +38,7 @@
               <el-option label="按重量计费" :value="2"></el-option>
             </el-select>
           </el-form-item>
-        </el-col>
+        </el-col> -->
         <el-col :span="12">
           <el-form-item
             label="客户联系人"

src/views/bpm/handleTask/components/saleOrder/entrustedReceiveReturnGoods/addReturnGoodsDialog.vue

@@ -44,7 +44,7 @@
         </el-col>
       </el-row>
       <el-row :gutter="20">
-        <el-col :span="12">
+        <!-- <el-col :span="12">
           <el-form-item
             label="计价方式"
             style="margin-bottom: 22px">
@@ -53,7 +53,7 @@
               <el-option label="按重量计费" :value="2"></el-option>
             </el-select>
           </el-form-item>
-        </el-col>
+        </el-col> -->
         <el-col :span="12">
           <el-form-item
             label="客户名称"