合同表单完善C

jnpf-java-boot/jnpf-web/src/views/scm/contractL/form.vue

@@ -700,6 +700,26 @@
                         <jnpf-form-tip-item label-width="0">
                             <el-table :data="dataForm.contractLCommodityList" size='mini'>
                                 <el-table-column type="index" width="50" label="序号" align="center" />
+                                <el-table-column label="选择商品" v-if="judgeShow('contractlcommodity-commodityCode')"
+                                    prop="commodityCode">
+                                    <template slot="header">
+                                        <span class="required-sign"
+                                            v-if="judgeRequired('contractlcommodityList-commodityCode')">*</span>选择商品
+                                    </template>
+                                    <template slot-scope="scope">
+                                        <JnpfPopupSelect v-model="scope.row.commodityCode"
+                                            @change="changeData('contractlcommodity-commodityCode', scope.$index)"
+                                            :rowIndex="scope.$index" :formData="dataForm"
+                                            :templateJson="interfaceRes.contractlcommoditycommodityName" placeholder="请选择"
+                                            :disabled="judgeWrite('contractlcommodityList') || judgeWrite('contractlcommodityList-commodityCode')"
+                                            propsValue="code" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
+                                            relationField='code' :field="'commodityCode' + scope.$index"
+                                            interfaceId="530288111456878597" :pageSize="20"
+                                            :columnOptions="contractlcommoditycommodityNamecolumnOptions" clearable
+                                            :style='{ "width": "100%" }'>
+                                        </JnpfPopupSelect>
+                                    </template>
+                                </el-table-column>
                                 <el-table-column label="商品名称" v-if="judgeShow('contractlcommodity-commodityName')"
                                     prop="commodityName">
                                     <template slot="header">
@@ -720,7 +740,7 @@
                                         </JnpfPopupSelect>
                                     </template>
                                 </el-table-column>
-                                <el-table-column label="商品编码" v-if="judgeShow('contractlcommodity-commodityCode')"
+                                <!-- <el-table-column label="商品编码" v-if="judgeShow('contractlcommodity-commodityCode')"
                                     prop="commodityCode">
                                     <template slot="header">
                                         <span class="required-sign"
@@ -734,7 +754,7 @@
                                             clearable :style='{ "width": "100%" }'>
                                         </JnpfInput>
                                     </template>
-                                </el-table-column>
+                                </el-table-column> -->
                                 <el-table-column label="商品规格" v-if="judgeShow('contractlcommodity-specifications')"
                                     prop="specifications">
                                     <template slot="header">
@@ -1379,7 +1399,7 @@ export default {
             contractLabelProps: { "label": "fullName", "value": "enCode" },
             contractlpriceformulapriceFormulaTypeOptions: [],
             contractlpriceformulapriceFormulaTypeProps: { "label": "fullName", "value": "enCode" },
-            contractlcommoditycommodityNamecolumnOptions: [{ "label": "商品名称", "value": "name" }, { "label": "商品编码", "value": "code" }, { "label": "商品图片", "value": "photo" }, { "label": "商品规格", "value": "spec" }, { "label": "库存单位", "value": "inventory_unit_id" }, { "label": "采购单位", "value": "order_main_unit_id" }, { "label": "销售单位", "value": "sales_main_unit_id" },],
+            contractlcommoditycommodityNamecolumnOptions: [{ "label": "商品名称", "value": "name" }, { "label": "商品编码", "value": "code" }, { "label": "商品规格", "value": "spec" }, { "label": "库存单位", "value": "inventory_unit_name" }, { "label": "采购单位", "value": "order_main_unit_name" }, { "label": "销售单位", "value": "sales_main_unit_name" },],
             contractlcommodityprocureUnitOptions: [{ "fullName": "选项一", "id": "1" }, { "fullName": "选项二", "id": "2" }],
             contractlcommodityprocureUnitProps: { "label": "fullName", "value": "id" },
             contractlfeeclausefeeTypeOptions: [],
@@ -1481,6 +1501,10 @@ export default {
         },
         'dataForm.subject': function (val, oldVal) {
             this.getSubjectInfo()
+        },
+        'dataForm.commodityCode': function (val, oldVal) {
+            console.log(val)
+            console.log(oldVal)
         }
     },
     created() {