试运行合同问题修改

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/ProductWarehouseServiceImpl.java

@@ -568,6 +568,7 @@ public class ProductWarehouseServiceImpl extends ServiceImpl<ProductWarehouseMap
         organize = organize.replace("]","");
         QueryWrapper<ProductWarehouseEntity> productWarehouseQueryWrapper=new QueryWrapper<>();
         productWarehouseQueryWrapper.like("a.organize_json_id",organize);
+        productWarehouseQueryWrapper.like("a.code",productWarehousePagination.getCode());
         Page<ProductWarehouseEntity> page=new Page<>(productWarehousePagination.getCurrentPage(), productWarehousePagination.getPageSize());
         IPage<ProductWarehouseEntity> userIPage = productWarehouseMapper.getProductWhList(page, productWarehousePagination, productWarehouseQueryWrapper);
         return productWarehousePagination.setData(userIPage.getRecords(),userIPage.getTotal());

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

@@ -362,7 +362,8 @@
             <template v-else> </template>
           </el-col>
           <el-col :span="8" v-if="judgeShow('relatedContractId')">
-            <template v-if="dataForm.procurementModel == 1">
+
+            <template v-if="dataForm.procurementModel == 1 && dataForm.contractType == 1">
               <jnpf-form-tip-item label="关联销售合同" v-if="judgeShow('relatedContractId')"
                 prop="relatedContractId">
                 <JnpfPopupSelect v-model="dataForm.relatedContractId"
@@ -377,6 +378,22 @@
                 </JnpfPopupSelect>
               </jnpf-form-tip-item>
             </template>
+
+            <template v-if="dataForm.procurementModel == 2 && dataForm.contractType == 2">
+              <jnpf-form-tip-item label="关联采购合同" v-if="judgeShow('relatedContractId')"
+                prop="relatedContractId">
+                <JnpfPopupSelect v-model="dataForm.relatedContractId"
+                  @change="changeData('relatedContractId', -1)" :rowIndex="null"
+                  :formData="dataForm" :templateJson="interfaceRes.relatedContractId"
+                  placeholder="请选择" :disabled="judgeWrite('relatedContractId')" propsValue="id"
+                  popupWidth="800px" popupTitle="选择数据" popupType="dialog"
+                  relationField="contract_name" field="relatedContractId"
+                  interfaceId="572774006868942981" :pageSize="20"
+                  :columnOptions="relatedContractIdcolumnOptions" clearable
+                  :style="{ width: '100%' }">
+                </JnpfPopupSelect>
+              </jnpf-form-tip-item>
+            </template>
           </el-col>
           <el-col :span="8" v-if="judgeShow('subject2')">
             <template v-if="dataForm.contractType == 1">
@@ -1382,7 +1399,7 @@ export default {
       procurementModelOptions: [],
       procurementModelProps: { label: "fullName", value: "enCode" },
       relatedContractIdcolumnOptions: [
-        { label: "销售合同", value: "contract_name" }
+        { label: "合同名称", value: "contract_name" }
       ],
       subject2columnOptions: [
         { label: "类型", value: "subject_basic_type" },

jnpf-java-boot/jnpf-web/src/views/scm/publicPopup/ProductListBox.vue

@@ -1,57 +1,42 @@
 <template>
-  <el-dialog
+  <el-dialog title="选择数据" :close-on-click-modal="false" :visible.sync="visible"
-    title="选择数据"
+    class="JNPF-dialog JNPF-dialog_center" lock-scroll append-to-body width="800px">
-    :close-on-click-modal="false"
+    <el-row class="JNPF-common-search-box" :gutter="24">
-    :visible.sync="visible"
-    class="JNPF-dialog JNPF-dialog_center"
-    lock-scroll
-    append-to-body
-    width="800px"
-  >
-    <el-row class="JNPF-common-search-box" :gutter="16">
       <el-form @submit.native.prevent>
-        <el-col :span="10">
+        <el-col :span="8">
           <el-form-item label="商品名称">
-            <el-input
+            <el-input v-model="keyword" placeholder="请输入关键词查询" clearable
-              v-model="keyword"
+              @keyup.enter.native="search()" />
-              placeholder="请输入关键词查询"
-              clearable
-              @keyup.enter.native="search()"
-            />
           </el-form-item>
         </el-col>
+
+        <el-col :span="8">
+
+          <el-form-item label="商品编码">
+            <el-input v-model="code" placeholder="请输入关键词查询" clearable
+              @keyup.enter.native="search()" />
+          </el-form-item>
+
+        </el-col>
         <el-col :span="8">
           <el-form-item>
-            <el-button type="primary" icon="el-icon-search" @click="search()"
+            <el-button type="primary" icon="el-icon-search"
-              >{{ $t("common.search") }}
+              @click="search()">{{ $t("common.search") }}
             </el-button>
-            <el-button icon="el-icon-refresh-right" @click="refresh()"
+            <el-button icon="el-icon-refresh-right" @click="refresh()">{{ $t("common.reset") }}
-              >{{ $t("common.reset") }}
             </el-button>
           </el-form-item>
         </el-col>
       </el-form>
       <div class="JNPF-common-search-box-right">
-        <el-tooltip
+        <el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
-          effect="dark"
+          <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
-          :content="$t('common.refresh')"
+            @click="search()" />
-          placement="top"
-        >
-          <el-link
-            icon="icon-ym icon-ym-Refresh JNPF-common-head-icon"
-            :underline="false"
-            @click="search()"
-          />
         </el-tooltip>
       </div>
     </el-row>
-    <JNPF-table
+    <JNPF-table v-loading="listLoading" :data="list" hasC @selection-change="handleSelectionChange"
-      v-loading="listLoading"
+      :border="false">
-      :data="list"
-      hasC
-      @selection-change="handleSelectionChange"
-      :border="false"
-    >
       <el-table-column prop="id" label="商品ID" align="left"> </el-table-column>
       <el-table-column prop="name" label="商品名称" align="left">
       </el-table-column>
@@ -67,12 +52,8 @@
       <el-table-column prop="salesMainUnitName" label="销售单位">
       </el-table-column>
     </JNPF-table>
-    <pagination
+    <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
-      :total="total"
+      @pagination="init" />
-      :page.sync="listQuery.currentPage"
-      :limit.sync="listQuery.pageSize"
-      @pagination="init"
-    />
     <span slot="footer" class="dialog-footer">
       <el-button @click="visible = false">{{
         $t("common.cancelButton")
@@ -93,6 +74,7 @@ export default {
       visible: false,
       listLoading: true,
       keyword: "",
+      code: "",
       list: [],
       total: 0,
       listQuery: {
@@ -120,6 +102,7 @@ export default {
         ...this.listQuery,
         dataType: 0,
         name: this.keyword,
+        code: this.code,
         excludeIdList: this.excludeIdList,
         type: 1
       };
@@ -135,6 +118,7 @@ export default {
     },
     refresh() {
       this.keyword = "";
+      this.code = "";
       this.listQuery.currentPage = 1;
       this.listQuery.pageSize = 20;
       this.listQuery.sort = "desc";