部分需求更改

src/components/contractCom/selectContract.vue

@@ -243,12 +243,12 @@ const config = computed(() => {
     {
       attrs: {
         label: "业务员",
-        prop: "createUser",
+        prop: "salesmanName",
         width: 100,
       },
-      render(type) {
-        return proxy.dictValueLabel(type, userList.value);
-      },
+      // render(type) {
+      //   return proxy.dictValueLabel(type, userList.value);
+      // },
     },
     {
       attrs: {

src/components/contractCom/selectSample.vue

@@ -281,12 +281,12 @@ const config = computed(() => {
     {
       attrs: {
         label: "业务员",
-        prop: "createUser",
+        prop: "salesmanName",
         width: 140,
       },
-      render(type) {
-        return proxy.dictValueLabel(type, userList.value);
-      },
+      // render(type) {
+      //   return proxy.dictValueLabel(type, userList.value);
+      // },
     },
     {
       attrs: {

src/components/process/EHSD/Contract.vue

@@ -1132,9 +1132,9 @@ const rules = ref({
   ],
   currency: [{ required: true, message: "请选择币种", trigger: "change" }],
   effective: [{ required: true, message: "请输入报价有效期", trigger: "blur" }],
-  deliveryTime: [
-    { required: true, message: "请选择交货期限", trigger: "change" },
-  ],
+  // deliveryTime: [
+  //   { required: true, message: "请选择交货期限", trigger: "change" },
+  // ],
   paymentMethod: [
     { required: true, message: "请选择付款方式", trigger: "change" },
   ],
@@ -1153,9 +1153,9 @@ const rules = ref({
   transportMethod: [
     { required: true, message: "请选择运输方式", trigger: "change" },
   ],
-  transportRemark: [
-    { required: true, message: "请输入运输说明", trigger: "blur" },
-  ],
+  // transportRemark: [
+  //   { required: true, message: "请输入运输说明", trigger: "blur" },
+  // ],
   remark: [{ required: true, message: "请输入付款条件", trigger: "blur" }],
   rate: [{ required: true, message: "请输入汇率", trigger: "blur" }],
 });

src/components/process/EHSD/ContractChange.vue

@@ -1099,9 +1099,9 @@ const rules = ref({
   ],
   currency: [{ required: true, message: "请选择币种", trigger: "change" }],
   effective: [{ required: true, message: "请输入报价有效期", trigger: "blur" }],
-  deliveryTime: [
-    { required: true, message: "请选择交货期限", trigger: "change" },
-  ],
+  // deliveryTime: [
+  //   { required: true, message: "请选择交货期限", trigger: "change" },
+  // ],
   paymentMethod: [
     { required: true, message: "请选择付款方式", trigger: "change" },
   ],
@@ -1120,9 +1120,9 @@ const rules = ref({
   transportMethod: [
     { required: true, message: "请选择运输方式", trigger: "change" },
   ],
-  transportRemark: [
-    { required: true, message: "请输入运输说明", trigger: "blur" },
-  ],
+  // transportRemark: [
+  //   { required: true, message: "请输入运输说明", trigger: "blur" },
+  // ],
   remark: [{ required: true, message: "请输入付款条件", trigger: "blur" }],
   rate: [{ required: true, message: "请输入汇率", trigger: "blur" }],
 });

src/components/process/EHSD/PriceSheet.vue

@@ -755,9 +755,9 @@ const rules = ref({
   ],
   currency: [{ required: true, message: "请选择币种", trigger: "change" }],
   effective: [{ required: true, message: "请输入报价有效期", trigger: "blur" }],
-  deliveryTime: [
-    { required: true, message: "请选择交货期限", trigger: "change" },
-  ],
+  // deliveryTime: [
+  //   { required: true, message: "请选择交货期限", trigger: "change" },
+  // ],
   paymentMethod: [
     { required: true, message: "请选择付款方式", trigger: "change" },
   ],
@@ -770,9 +770,9 @@ const rules = ref({
   transportMethod: [
     { required: true, message: "请选择运输方式", trigger: "change" },
   ],
-  transportRemark: [
-    { required: true, message: "请输入运输说明", trigger: "blur" },
-  ],
+  // transportRemark: [
+  //   { required: true, message: "请输入运输说明", trigger: "blur" },
+  // ],
   remark: [{ required: true, message: "请输入付款条件", trigger: "blur" }],
 });
 const getDict = () => {

src/components/process/EHSD/Sample.vue

@@ -1118,9 +1118,9 @@ const rules = ref({
   ],
   currency: [{ required: true, message: "请选择币种", trigger: "change" }],
   effective: [{ required: true, message: "请输入报价有效期", trigger: "blur" }],
-  deliveryTime: [
-    { required: true, message: "请选择交货期限", trigger: "change" },
-  ],
+  // deliveryTime: [
+  //   { required: true, message: "请选择交货期限", trigger: "change" },
+  // ],
   paymentMethod: [
     { required: true, message: "请选择付款方式", trigger: "change" },
   ],
@@ -1139,9 +1139,9 @@ const rules = ref({
   transportMethod: [
     { required: true, message: "请选择运输方式", trigger: "change" },
   ],
-  transportRemark: [
-    { required: true, message: "请输入运输说明", trigger: "blur" },
-  ],
+  // transportRemark: [
+  //   { required: true, message: "请输入运输说明", trigger: "blur" },
+  // ],
   remark: [{ required: true, message: "请输入付款条件", trigger: "blur" }],
   submitType: [
     { required: true, message: "请选择提交类型", trigger: "change" },

src/components/process/EHSD/SampleChange.vue

@@ -1099,9 +1099,9 @@ const rules = ref({
   ],
   currency: [{ required: true, message: "请选择币种", trigger: "change" }],
   effective: [{ required: true, message: "请输入报价有效期", trigger: "blur" }],
-  deliveryTime: [
-    { required: true, message: "请选择交货期限", trigger: "change" },
-  ],
+  // deliveryTime: [
+  //   { required: true, message: "请选择交货期限", trigger: "change" },
+  // ],
   paymentMethod: [
     { required: true, message: "请选择付款方式", trigger: "change" },
   ],
@@ -1120,9 +1120,9 @@ const rules = ref({
   transportMethod: [
     { required: true, message: "请选择运输方式", trigger: "change" },
   ],
-  transportRemark: [
-    { required: true, message: "请输入运输说明", trigger: "blur" },
-  ],
+  // transportRemark: [
+  //   { required: true, message: "请输入运输说明", trigger: "blur" },
+  // ],
   remark: [{ required: true, message: "请输入付款条件", trigger: "blur" }],
   submitType: [
     { required: true, message: "请选择提交类型", trigger: "change" },

src/views/EHSD/saleContract/contractEHSD/index.vue

@@ -8,6 +8,8 @@
         :loading="loading"
         :selectConfig="selectConfig"
         :statConfig="statConfig"
+        :onMoreSearch="true"
+        @moreSearch="clickMoreSearch"
         highlight-current-row
         :action-list="[
           {
@@ -263,6 +265,26 @@
         >
       </template>
     </el-dialog>
+
+    <el-dialog
+      :title="'高级检索'"
+      v-model="moreSearchDialog"
+      width="500px"
+      destroy-on-close
+    >
+      <byForm
+        :formConfig="formSearchConfig"
+        :formOption="formOption"
+        v-model="sourceList.pagination"
+      >
+      </byForm>
+      <template #footer>
+        <el-button @click="moreSearchReset" size="large">重置</el-button>
+        <el-button @click="moreSearchQuery" type="primary" size="large"
+          >搜索</el-button
+        >
+      </template>
+    </el-dialog>
   </div>
 </template>
 
@@ -420,7 +442,7 @@ const config = computed(() => {
     {
       attrs: {
         label: "业务员",
-        prop: "userName",
+        prop: "salesmanName",
         width: 100,
       },
       // render(type) {
@@ -1112,6 +1134,69 @@ const submitRecords = () => {
 const openFile = (item) => {
   window.open(item.fileUrl, "_blank");
 };
+
+const formSearchConfig = computed(() => {
+  return [
+    {
+      type: "select",
+      label: "审批状态",
+      prop: "status",
+      itemWidth: 50,
+      data: status.value,
+      clearable: true,
+    },
+    {
+      type: "select",
+      label: "归属公司",
+      prop: "sellCorporationId",
+      itemWidth: 50,
+      data: corporationList.value,
+      clearable: true,
+    },
+    {
+      type: "select",
+      label: "业务员",
+      prop: "userId",
+      data: userList.value,
+      clearable: true,
+    },
+    {
+      type: "date",
+      itemType: "datetime",
+      label: "合同时间",
+      prop: "beginTime",
+      placeholder: "合同开始时间",
+      itemWidth: 50,
+    },
+    {
+      type: "date",
+      itemType: "datetime",
+      label: " ",
+      prop: "endTime",
+      placeholder: "合同结束时间",
+      itemWidth: 50,
+    },
+  ];
+});
+const moreSearchDialog = ref(false);
+const clickMoreSearch = () => {
+  moreSearchDialog.value = true;
+};
+const moreSearchQuery = () => {
+  moreSearchDialog.value = false;
+  getList();
+};
+const moreSearchReset = () => {
+  sourceList.value.pagination = {
+    total: 0,
+    pageNum: sourceList.value.pagination.pageNum,
+    pageSize: sourceList.value.pagination.pageSize,
+    keyword: "",
+    status: "",
+    sellCorporationId: "",
+  };
+  moreSearchQuery();
+};
 </script>
 
 <style lang="scss" scoped>

src/views/process/processApproval/index.vue

@@ -804,6 +804,7 @@ const getFlowName = () => {
       height: 220px;
       background: #fff;
       padding: 20px 20px 0px 20px;
+      overflow: auto;
     }
   }
   .right-card {