1

src/components/process/EHSD/SampleChange.vue

@@ -1730,7 +1730,9 @@ onMounted(() => {
       for (const key in res) {
         formData.data[key] = res[key];
       }
-      formData.data.oldSampleId = formData.data.id;
+      if (!formData.data.oldSampleId) {
+        formData.data.oldSampleId = formData.data.id;
+      }
       delete formData.data.id;
       proxy
         .post("/fileInfo/getList", {

src/components/process/PurchasePayment.vue

@@ -9,7 +9,7 @@
     >
       <template #supplyId>
         <div style="width: 100%">
-          <el-form-item prop="supplyId">
+          <el-form-item prop="supplyId" label="供应商">
             <el-select
               v-model="formData.data.supplyId"
               filterable

src/components/process/SendFunds.vue

@@ -1228,6 +1228,19 @@ onMounted(() => {
           formData.data[key] = res[key];
         }
         proxy
+          .post("/accountRequestFunds/page", {
+            pageNum: 1,
+            pageSize: 999,
+            type: "1",
+            writeOffStatus: "0",
+            corporationId: formData.data.corporationId,
+            status: "30",
+            createUser: useUserStore().user.userId,
+          })
+          .then((res) => {
+            advanceList.value = res.rows;
+          });
+        proxy
           .post("/fileInfo/getList", {
             businessIdList: [route.query.businessId],
           })

src/views/EHSD/procurement/purchasedEHSD/index.vue

@@ -80,6 +80,14 @@ const status = ref([
     value: 30,
   },
   {
+    label: "变更中",
+    value: 60,
+  },
+  {
+    label: "已变更",
+    value: 70,
+  },
+  {
     label: "作废",
     value: 88,
   },

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

@@ -210,6 +210,18 @@ const status = ref([
     value: 30,
   },
   {
+    label: "变更中",
+    value: 60,
+  },
+  {
+    label: "已变更",
+    value: 70,
+  },
+  {
+    label: "作废",
+    value: 88,
+  },
+  {
     label: "终止",
     value: 99,
   },

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

@@ -37,6 +37,49 @@
             <span>{{ item.advanceRatio }}%</span>
           </div>
         </template>
+
+        <template #tags="{ item }">
+          <div style="width: 100%" v-if="item.tag">
+            <el-tag
+              style="margin-right: 8px"
+              type="success"
+              v-for="(tag, index) in item.tag"
+              closable
+              :key="index"
+              @close="tagClose(tag, item)"
+            >
+              {{ dictValueLabel(tag, customerTag) }}
+            </el-tag>
+            <template v-if="item.tag.length !== customerTag.length">
+              <el-select
+                v-if="item.addTagShow"
+                v-model="addTag"
+                style="width: 100%"
+                @change="
+                  (val) => {
+                    return changeTag(val, item);
+                  }
+                "
+              >
+                <el-option
+                  v-for="tag in customerTag"
+                  :key="tag.value"
+                  :label="tag.label"
+                  :value="tag.value"
+                  :disabled="judgeTagSelect(item.tag, tag.value)"
+                />
+              </el-select>
+              <el-tag
+                style="cursor: pointer"
+                type="success"
+                @click="showSelect(item)"
+                v-else
+              >
+                +
+              </el-tag>
+            </template>
+          </div>
+        </template>
       </byTable>
     </div>
 
@@ -468,6 +511,13 @@ const config = computed(() => {
         "min-width": 220,
       },
     },
+    // {
+    //   attrs: {
+    //     label: "客户标签",
+    //     slot: "tags",
+    //     width: 180,
+    //   },
+    // },
     {
       attrs: {
         label: "报价金额",
@@ -528,6 +578,8 @@ const config = computed(() => {
     },
   ];
 });
+const customerTag = ref([]);
+
 const getDict = () => {
   proxy
     .post("/saleQuotation/page", { pageNum: 1, pageSize: 999 })
@@ -550,7 +602,12 @@ const getDict = () => {
   });
 
   proxy
-    .getDictOne(["trade_mode", "account_currency", "shipping_method"])
+    .getDictOne([
+      "trade_mode",
+      "account_currency",
+      "shipping_method",
+      "customer_tag",
+    ])
     .then((res) => {
       tradeMethods.value = res["trade_mode"].map((x) => ({
         label: x.dictValue,
@@ -564,6 +621,10 @@ const getDict = () => {
         label: x.dictValue,
         value: x.dictKey,
       }));
+      customerTag.value = res["customer_tag"].map((x) => ({
+        label: x.dictValue,
+        value: x.dictKey,
+      }));
     });
 };
 const getList = async (req) => {
@@ -697,6 +758,55 @@ const getAllMoney = (num) => {
   }
   return money;
 };
+const addTag = ref("");
+const judgeTagSelect = (data, val) => {
+  if (data && data.length > 0) {
+    if (data.includes(val)) {
+      return true;
+    }
+  }
+  return false;
+};
+
+const changeTag = (val, item) => {
+  let data = {
+    id: item.buyCorporationId,
+    tag: JSON.parse(JSON.stringify(item.tag)),
+  };
+  data.tag.push(val);
+  data.tag = data.tag.join(",");
+  proxy.post("/customer/editTag", data).then(() => {
+    ElMessage({
+      message: "添加成功",
+      type: "success",
+    });
+    item.addTagShow = false;
+    addTag.value = "";
+    getList();
+  });
+};
+
+const tagClose = (val, item) => {
+  let data = {
+    id: item.buyCorporationId,
+    tag: JSON.parse(JSON.stringify(item.tag)),
+  };
+  data.tag = data.tag.filter((row) => row !== val);
+  if (data.tag && data.tag.length > 0) {
+    data.tag = data.tag.join(",");
+  } else {
+    data.tag = "";
+  }
+  proxy.post("/customer/editTag", data).then(() => {
+    ElMessage({
+      message: "添加成功",
+      type: "success",
+    });
+    item.addTagShow = false;
+    addTag.value = "";
+    getList();
+  });
+};
 </script>
 
 <style lang="scss" scoped>

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

@@ -210,6 +210,18 @@ const status = ref([
     value: 30,
   },
   {
+    label: "变更中",
+    value: 60,
+  },
+  {
+    label: "已变更",
+    value: 70,
+  },
+  {
+    label: "作废",
+    value: 88,
+  },
+  {
     label: "终止",
     value: 99,
   },

src/views/finance/fundManage/accountPayment/index.vue

@@ -20,6 +20,9 @@
             <span>{{ item.currency }} {{ item.amount }}</span>
           </div>
         </template>
+        <template #file="{ item }">
+          <div style="width: 100%">aa</div>
+        </template>
       </byTable>
     </div>
     <el-dialog
@@ -349,6 +352,14 @@ const config = computed(() => {
         align: "right",
       },
     },
+    // {
+    //   attrs: {
+    //     label: "关联附件",
+    //     slot: "file",
+    //     width: 200,
+    //     align: "left",
+    //   },
+    // },
     {
       attrs: {
         label: "款项说明",
@@ -819,6 +830,13 @@ const formSearchConfig = computed(() => {
       label: "币种",
       data: accountCurrency.value,
       clearable: true,
+      itemWidth: 50,
+    },
+    {
+      type: "input",
+      prop: "oppositeAccountName",
+      label: "对方账户",
+      itemWidth: 50,
     },
     {
       type: "slot",

src/views/finance/fundManage/funds/index.vue

@@ -542,6 +542,13 @@ const formSearchConfig = computed(() => {
       label: "付款方式",
       data: fundsPaymentMethod.value,
       clearable: true,
+      itemWidth: 50,
+    },
+    {
+      type: "input",
+      prop: "oppositeAccountName",
+      label: "对方账户",
+      itemWidth: 50,
     },
     {
       type: "select",

src/views/process/dealWith/index.vue

@@ -13,6 +13,7 @@
           //element talbe事件都能传
         }"
         @get-list="getList"
+        ref="table"
       >
         <template #slotName="{ item }">
           {{ item.createTime }}
@@ -32,7 +33,7 @@ const sourceList = ref({
     total: 3,
     pageNum: 1,
     pageSize: 10,
-    status: 3,
+    status: 1,
   },
 });
 
@@ -178,15 +179,22 @@ const getList = async (req) => {
       }, 200);
     });
 };
-
+const table = ref(null);
+const searchItemSelct = () => {
+  // 默认选中的方法
+  table.value.searchItemSelct(
+    selectConfig.value[1].data[2],
+    selectConfig.value[1]
+  );
+};
 onMounted(() => {
   const route = useRoute();
   if (route.query && route.query.type) {
     sourceList.value.pagination.status = route.query.type;
+    getList();
   } else {
-    sourceList.value.pagination.status = 3;
+    searchItemSelct();
   }
-  getList();
 });
 </script>