Merge branch 'feature/合同' into develop

src/views/contract/components/Edit.vue

@@ -294,6 +294,7 @@
             this.productData =
               product.length > 0
                 ? product.map((item) => ({
+                    prodCode: item.prodCode,
                     id: item.prodId,
                     prodName: item.prodName,
                     prodClass: item.prodClass,

src/views/contract/components/ProductTable.vue

@@ -21,11 +21,17 @@
             <amount-input
               v-model.trim="row.price"
               placeholder="请输入金额"
+              size="mini"
               :value="row.price"
               @change="handleChange(row)" />
           </span>
           <span v-else-if="item.prop == 'count'">
-            <el-input-number v-model="row.count" :min="0" size="mini" @change="handleChange(row)" />
+            <el-input
+              v-model.trim="row.count"
+              :min="0"
+              onkeyup="value=value.replace(/[^\d]/g,'')"
+              size="mini"
+              @change="handleChange(row)" />
           </span>
           <span v-else-if="item.label == '合计'">
             {{ calculatedDiscount(row.price, row.count) }}
@@ -68,6 +74,11 @@
       return {
         data: [],
         columns: [
+          {
+            label: '产品编码',
+            width: '180px',
+            prop: 'prodCode',
+          },
           {
             label: '产品名称',
             width: '180px',