Jelajahi Sumber

fix(销售订单): 新增/修改销售订单,选择合同弹出框中,增加合同编号检索字段

qihao 2 tahun lalu
induk
melakukan
40759ae6ef

+ 14 - 15
src/views/saleManage/saleOrder/components/contractListDialog.vue

@@ -90,6 +90,20 @@
             align: 'center',
             align: 'center',
             label: '选择'
             label: '选择'
           },
           },
+          {
+            prop: 'contractNo',
+            label: '合同编码',
+            align: 'center',
+            showOverflowTooltip: true,
+            minWidth: 170
+          },
+          {
+            prop: 'contractNumber',
+            label: '合同编号',
+            align: 'center',
+            showOverflowTooltip: true,
+            minWidth: 200
+          },
           {
           {
             prop: 'contractName',
             prop: 'contractName',
             label: '合同名称',
             label: '合同名称',
@@ -148,21 +162,6 @@
             minWidth: 130
             minWidth: 130
           },
           },
 
 
-          {
-            prop: 'contractNo',
-            label: '编码',
-            align: 'center',
-            showOverflowTooltip: true,
-            minWidth: 170
-          },
-          {
-            prop: 'contractNumber',
-            label: '编号',
-            align: 'center',
-            showOverflowTooltip: true,
-            minWidth: 200
-          },
-
           {
           {
             prop: 'enabled',
             prop: 'enabled',
             label: '是否可用',
             label: '是否可用',

+ 40 - 15
src/views/saleManage/saleOrder/components/searchContract.vue

@@ -8,8 +8,8 @@
       @submit.native.prevent
       @submit.native.prevent
     >
     >
       <el-row :gutter="10">
       <el-row :gutter="10">
-  
-        
+
+
         <el-col v-bind="styleResponsive ? { md: 6 } : { span: 6 }">
         <el-col v-bind="styleResponsive ? { md: 6 } : { span: 6 }">
           <el-form-item label="合同名称">
           <el-form-item label="合同名称">
             <el-input
             <el-input
@@ -20,12 +20,13 @@
             />
             />
           </el-form-item>
           </el-form-item>
         </el-col>
         </el-col>
+
         <el-col v-bind="styleResponsive ? { md: 6 } : { span: 6 }">
         <el-col v-bind="styleResponsive ? { md: 6 } : { span: 6 }">
           <el-form-item label="客户名称">
           <el-form-item label="客户名称">
             <el-input
             <el-input
               clearable
               clearable
               size="small"
               size="small"
-              v-model="where.contactName"
+              v-model="where.partaName"
               placeholder="请输入"
               placeholder="请输入"
             />
             />
           </el-form-item>
           </el-form-item>
@@ -40,9 +41,7 @@
             />
             />
           </el-form-item>
           </el-form-item>
         </el-col>
         </el-col>
-  
-  
-        <el-col v-bind="styleResponsive ? { md: 6 } : { span: 4 }">
+        <el-col v-bind="styleResponsive ? { md: 6 } : { span: 4 }" >
           <el-form-item>
           <el-form-item>
             <el-button
             <el-button
               size="small"
               size="small"
@@ -53,30 +52,57 @@
             >
             >
               查询
               查询
             </el-button>
             </el-button>
-  
+
             <el-button
             <el-button
               @click="reset"
               @click="reset"
               icon="el-icon-refresh"
               icon="el-icon-refresh"
               class="ele-btn-icon"
               class="ele-btn-icon"
               size="medium"
               size="medium"
-              >重置</el-button
+            >重置</el-button
             >
             >
-  
             <slot></slot>
             <slot></slot>
           </el-form-item>
           </el-form-item>
         </el-col>
         </el-col>
+
+      </el-row>
+      <el-row :gutter="10">
+
+        <el-col v-bind="styleResponsive ? { md: 6 } : { span: 6 }">
+          <el-form-item label="合同编码">
+            <el-input
+              clearable
+              size="small"
+              v-model="where.contractNo"
+              placeholder="请输入"
+            />
+          </el-form-item>
+        </el-col>
+
+        <el-col v-bind="styleResponsive ? { md: 6 } : { span: 6 }">
+          <el-form-item label="合同编号">
+            <el-input
+              clearable
+              size="small"
+              v-model="where.contractNumber"
+              placeholder="请输入"
+            />
+          </el-form-item>
+        </el-col>
+
       </el-row>
       </el-row>
     </el-form>
     </el-form>
   </template>
   </template>
-  
+
   <script>
   <script>
     export default {
     export default {
       data() {
       data() {
         // 默认表单数据
         // 默认表单数据
         const defaultWhere = {
         const defaultWhere = {
-          name: '',
-          code: '',
-          modelType: ''
+          contractName: '',
+          partaName: '',
+          linkName: '',
+          contractNumber: '',
+          contractNo: '',
         };
         };
         return {
         return {
           defaultWhere,
           defaultWhere,
@@ -101,8 +127,7 @@
           this.where = { ...this.defaultWhere };
           this.where = { ...this.defaultWhere };
           this.search();
           this.search();
         },
         },
-      
+
       }
       }
     };
     };
   </script>
   </script>
-