产品清单改为物品清单

src/views/bpm/handleTask/components/businessOpportunity/addOpportunityDialog.vue

@@ -118,7 +118,7 @@
         </el-col>
       </el-row>
     </el-form>
-    <headerTitle title="产品清单"></headerTitle>
+    <headerTitle title="物品清单"></headerTitle>
     <inventoryTable
       :isCustomerMark="false"
       ref="inventoryTable"
@@ -424,7 +424,7 @@
           });
 
           if (this.$refs.inventoryTable.getTableValue().length == 0) {
-            this.$message.warning('产品清单不能为空');
+            this.$message.warning('物品清单不能为空');
 
             return;
           }

src/views/bpm/handleTask/components/businessOpportunity/opportunityDetailDialog.vue

@@ -78,7 +78,7 @@
       </el-row>
     </el-form>
 
-    <headerTitle title="产品清单"></headerTitle>
+    <headerTitle title="物品清单"></headerTitle>
 
     <inventoryTable
       pageName="businessOpportunity"
@@ -422,7 +422,7 @@
         try {
           await this.getValidate();
           if (this.$refs.inventoryTable.getTableValue().length == 0) {
-            this.$message.warning('产品清单不能为空');
+            this.$message.warning('物品清单不能为空');
 
             return;
           }

src/views/bpm/handleTask/components/contractBook/detailDialog.vue

@@ -227,7 +227,7 @@
         </el-col>
       </el-row>
     </el-form>
-    <headerTitle title="产品清单"></headerTitle>
+    <headerTitle title="物品清单"></headerTitle>
 
     <inventoryTabledetail
       ref="inventoryTabledetailRef"

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

@@ -141,9 +141,9 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="发票类型" prop="type1">
-            <el-radio v-model="form.type1" label="1">增值税普通发票</el-radio>
-            <el-radio v-model="form.type1" label="2">增值税专用发票</el-radio>
+          <el-form-item label="发票类型" prop="category">
+            <el-radio :disabled="taskDefinitionKey != 'starter'" v-model="form.category" :label="2">增值税普通发票</el-radio>
+            <el-radio :disabled="taskDefinitionKey != 'starter'" v-model="form.category" :label="1">增值税专用发票</el-radio>
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -300,7 +300,7 @@
           settlementAccountId: '',
           settlementAccountName: '',
           type: '',
-          type1: 2
+          category: 1
         },
         feeTypeList: [],
         accountingSubjectList: [],

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

@@ -108,6 +108,12 @@
             <el-input disabled v-model="form.companyName"></el-input>
           </el-form-item>
         </el-col>
+        <el-col :span="12">
+          <el-form-item label="发票类型" prop="category">
+            <el-radio disabled v-model="form.category" :label="2">增值税普通发票</el-radio>
+            <el-radio disabled v-model="form.category" :label="1">增值税专用发票</el-radio>
+          </el-form-item>
+        </el-col>
         <el-col :span="12">
           <el-form-item
             label="统一社会信用代码"
@@ -117,8 +123,7 @@
           </el-form-item>
         </el-col>
 
-      </el-row>
-      <el-row :gutter="12">
+    
         <el-col :span="12">
           <el-form-item
             label="开户银行"
@@ -135,9 +140,7 @@
             <el-input disabled v-model="form.companyBankAccount"></el-input>
           </el-form-item>
         </el-col>
-      </el-row>
-
-      <el-row :gutter="12">
+   
         <el-col :span="12">
           <el-form-item
             label="电话号码"

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

@@ -140,7 +140,7 @@
           {
             minWidth: 80,
             prop: 'singlePrice',
-            label: '单价',
+            label: '单价(￥)',
             slot: 'singlePrice',
             align: 'center'
           },
@@ -154,11 +154,16 @@
           {
             minWidth: 80,
             prop: 'totalPrice',
-            label: '金额',
+            label: '金额(￥)',
             slot: 'totalPrice',
             align: 'center'
+          },
+          {
+            minWidth: 80,
+            prop: 'taxRate',
+            label: '税率',
+            align: 'center'
           }
-
           // {
           //   width: 100,
           //   prop: 'sourceType',

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

@@ -71,7 +71,7 @@
         </el-col>
       </el-row>
     </el-form>
-    <headerTitle title="产品清单" style="margin-top: 15px"></headerTitle>
+    <headerTitle title="物品清单" style="margin-top: 15px"></headerTitle>
     <el-button type="primary" @click="openSupplier">新增供应商</el-button>
     <inventoryTable
       ref="inventoryTable"
@@ -482,7 +482,7 @@
           this.loading = true;
 
           if (this.$refs.inventoryTable.getTableValue().length == 0) {
-            this.$message.warning('产品清单不能为空');
+            this.$message.warning('物品清单不能为空');
             return;
           }
           

src/views/bpm/handleTask/components/inquiryManage/detailDialog.vue

@@ -57,7 +57,7 @@
       </el-row>
     </el-form>
 
-    <headerTitle title="产品清单" style="margin-top: 15px"></headerTitle>
+    <headerTitle title="物品清单" style="margin-top: 15px"></headerTitle>
     <ele-pro-table
       ref="table"
       :needPage="false"

src/views/bpm/handleTask/components/outsourcedWarehousingNoProcurement/detailDialog.vue

@@ -122,7 +122,7 @@
         </el-row>
       </el-form>
 
-      <headerTitle title="产品清单"></headerTitle>
+      <headerTitle title="物品清单"></headerTitle>
       <ele-pro-table
         ref="table"
         :needPage="false"

src/views/bpm/handleTask/components/purchaseOrder/invoice/addInvoiceDialog.vue

@@ -112,7 +112,7 @@
             </el-date-picker>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <!-- <el-col :span="12">
           <el-form-item
             label="计价方式"
             style="margin-bottom: 22px">
@@ -121,7 +121,7 @@
               <el-option label="按重量计费" :value="2"></el-option>
             </el-select>
           </el-form-item>
-        </el-col>
+        </el-col> -->
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">

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

@@ -252,7 +252,7 @@
         </el-col>
       </el-row>
 
-      <headerTitle title="报价单产品清单"></headerTitle>
+      <headerTitle title="报价单物品清单"></headerTitle>
       <inventoryTable
         ref="inventoryTable"
         :isCustomerMark="false"

src/views/bpm/handleTask/components/quotation/detailDialog.vue

@@ -174,7 +174,7 @@
       </el-row>
     </el-form>
 
-    <headerTitle title="报价单产品清单"></headerTitle>
+    <headerTitle title="报价单物品清单"></headerTitle>
 
     <inventoryTable
       ref="inventoryTable"

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

@@ -294,7 +294,7 @@
         </el-col>
       </el-row>
 
-      <headerTitle title="产品清单" style="margin-top: 30px"></headerTitle>
+      <headerTitle title="物品清单" style="margin-top: 30px"></headerTitle>
 
       <inventoryTable ref="inventoryTable"  :pricingWay="form.pricingWay" :isContractId='!!form.contractId'
                       @orderDiscountAmount="orderDiscountAmount"></inventoryTable>
@@ -648,7 +648,7 @@ export default {
     discountInput() {
       this.$refs.inventoryTable.discountInputByOrder(this.form.payAmount)
     },
-//产品清单修改单价或者数量重置优惠金额
+//物品清单修改单价或者数量重置优惠金额
     orderDiscountAmount(val = 0) {
       this.form.payAmount = val
     },

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

@@ -268,7 +268,7 @@
         </el-row>
       </el-form>
 
-      <headerTitle title="产品清单"></headerTitle>
+      <headerTitle title="物品清单"></headerTitle>
       <inventoryTabledetail
         ref="inventoryTabledetailRef"
         :isCustomerMark="true"

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

@@ -107,7 +107,7 @@
       </el-row>
 
     </el-form>
-    <headerTitle title="产品清单" style="margin-top: 30px"></headerTitle>
+    <headerTitle title="物品清单" style="margin-top: 30px"></headerTitle>
     <inventoryTable
       :pricingWay="form.pricingWay"
       ref="inventoryTableref"

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

@@ -96,7 +96,7 @@
       </el-row>
     </el-form>
 
-    <headerTitle title="产品清单"></headerTitle>
+    <headerTitle title="物品清单"></headerTitle>
     <ele-pro-table
       ref="table"
       :needPage="false"

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

@@ -108,7 +108,7 @@
       </el-row>
 
       <headerTitle
-        title="产品清单"
+        title="物品清单"
         style="margin-top: 30px"
       ></headerTitle>
       <inventoryTable

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

@@ -138,7 +138,7 @@
       </el-row>
     </el-form>
 
-    <headerTitle title="原产品清单"></headerTitle>
+    <headerTitle title="原物品清单"></headerTitle>
     <ele-pro-table
       ref="table"
       :needPage="false"
@@ -152,7 +152,7 @@
       </template>
     </ele-pro-table>
     <headerTitle
-      title="退货产品明细"
+      title="退货物品明细"
     ></headerTitle>
     <ele-pro-table
       ref="table"

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

@@ -55,7 +55,7 @@
       </el-row>
     </el-form>
 
-    <headerTitle title="产品清单" style="margin-top: 30px"></headerTitle>
+    <headerTitle title="物品清单" style="margin-top: 30px"></headerTitle>
     <ele-pro-table
       ref="table"
       :needPage="false"

src/views/bpm/handleTask/components/saleOrder/invoice/addInvoiceDialog.vue

@@ -129,7 +129,7 @@
           </el-col>
         </el-row>
       </el-form>
-      <headerTitle title="产品清单" style="margin-top: 30px"></headerTitle>
+      <headerTitle title="物品清单" style="margin-top: 30px"></headerTitle>
       <inventoryTable
         :pricingWay="form.pricingWay"
         :entrustedCode="form.entrustedCode"

src/views/bpm/handleTask/components/saleOrder/invoiceConfirm/detailDialog.vue

@@ -136,7 +136,7 @@
         </el-row>
       </el-form>
 
-      <headerTitle title="产品清单"></headerTitle>
+      <headerTitle title="物品清单"></headerTitle>
       <ele-pro-table
         ref="table"
         :needPage="false"

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

@@ -94,7 +94,7 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <headerTitle title="原产品清单" style="margin-top: 30px"></headerTitle>
+      <headerTitle title="原物品清单" style="margin-top: 30px"></headerTitle>
       <ele-pro-table
         ref="table"
         :needPage="false"
@@ -105,7 +105,7 @@
       >
       </ele-pro-table>
       <headerTitle
-        title="退货产品明细"
+        title="退货物品明细"
         style="margin-top: 30px"
         v-show="!['40', '50'].includes(form.type)"
       ></headerTitle>

src/views/bpm/handleTask/components/saleOrder/returnGoods/detailDialog.vue

@@ -102,7 +102,7 @@
         </el-col>
       </el-row>
     </el-form>
-    <headerTitle title="原产品清单" style="margin-top: 30px"></headerTitle>
+    <headerTitle title="原物品清单" style="margin-top: 30px"></headerTitle>
     <ele-pro-table
       ref="table"
       :needPage="false"
@@ -113,7 +113,7 @@
     >
     </ele-pro-table>
     <headerTitle
-      title="退货产品明细"
+      title="退货物品明细"
       v-show="['10', '20', '30'].includes(form.type)"
     ></headerTitle>
     <ele-pro-table