Merge branch 'stage' into dev0.3

src/components/byForm/index.vue

@@ -51,6 +51,7 @@
           :min="i.min"
           :maxlength="i.maxlength"
           :readonly="i.readonly ? i.readonly : false"
+          :clearable="i.clearable ? i.clearable : false"
         >
           <template #prepend>
             <el-select

src/components/product/treeList.vue

@@ -30,8 +30,8 @@
       >
         <template #default="{ node, data }">
           <div class="custom-tree-node">
-            <div style="flex: 1">{{ node.label }}</div>
-            <div style="float: right; width: 71px; margin-left: 10px">
+            <div style="flex: 1">{{ node.label}}</div>
+            <div style="float: right; width: 71px; margin-left: 10px" v-if="activeNode == data.id">
               <el-icon :size="17" @click.stop="() => edit(node, data)">
                 <Edit />
               </el-icon>
@@ -106,7 +106,9 @@ onMounted(() => {});
 const search = ref("");
 const emit = defineEmits(["update:modelValue"]);
 const { proxy } = getCurrentInstance();
+let activeNode = ref('');
 const treeChange = (e, data) => {
+  activeNode.value = e.id
   if (proxy.type == "radio") {
     emit("update:modelValue", e.id);
     emit("change", e);

src/components/treeList/index.vue

@@ -50,6 +50,7 @@ const search = ref('')
 const emit = defineEmits(['update:modelValue'])
 const { proxy } = getCurrentInstance()
 const treeChange = (e, data) => {
+	console.log(e,12312332323232123)
 	if (proxy.type == 'radio') {
 		emit('update:modelValue', e.id)
 		emit('change', e)

src/views/customer/portrait/com/LatestProgress.vue

@@ -40,11 +40,13 @@ const getData = () => {
   loading.value = true;
   proxy.post("/saleQuotation/latestFollowUp", { id: props.customerId }).then((res) => {
     progressList.value = res.rows;
-    proxy.post("/fileInfo/getList", { businessIdList: res.rows.map((rows) => rows.id) }).then((fileObj) => {
-      for (let i = 0; i < res.rows.length; i++) {
-        progressList.value[i].fileList = fileObj[progressList.value[i].id] || [];
-      }
-    });
+    if (res.rows && res.rows.length > 0 && res.rows.map((rows) => rows.id).length > 0) {
+      proxy.post("/fileInfo/getList", { businessIdList: res.rows.map((rows) => rows.id) }).then((fileObj) => {
+        for (let i = 0; i < res.rows.length; i++) {
+          progressList.value[i].fileList = fileObj[progressList.value[i].id] || [];
+        }
+      });
+    }
     setTimeout(() => {
       loading.value = false;
     }, 200);

src/views/product/product/index.vue

@@ -528,7 +528,7 @@ const getList = async (req) => {
 };
 
 const treeChange = (e) => {
-  console.log(e);
+  console.log(e,123123);
   sourceList.value.pagination.productClassifyId = e.id;
   getList({ productClassifyId: e.id });
 };

src/views/purchaseManage/supplier/supplier/index.vue

@@ -189,7 +189,7 @@ const fileList = ref([]);
 const uploadData = ref({});
 let rules = ref({
   name: [{ required: true, message: "请输入供应商名称", trigger: "blur" }],
-  // type: [{ required: true, message: "请选择供应商类型", trigger: "change" }],
+  type: [{ required: true, message: "请选择供应商类型", trigger: "change" }],
   countryId: [{ required: true, message: "请选择国家", trigger: "change" }],
   // provinceId: [{ required: true, message: "请选择省/洲", trigger: "change" }],
   // cityId: [{ required: true, message: "请选择城市", trigger: "change" }],

src/views/salesMange/saleContract/contract/index.vue

@@ -46,7 +46,7 @@
                     </div>
                     <div style="display: flex; justify-content: space-between; padding: 8px 0">
                       <span>认领金额: {{ record.currency }} {{ record.money }}</span>
-                      <span>汇率: {{ item.rate }}</span>
+                      <span>汇率: {{ record.rate }}</span>
                     </div>
                   </div>
                 </div>

src/views/salesMange/shipmentMange/packing/index.vue

@@ -1008,7 +1008,9 @@ const handleChangeContract = (val) => {
     .then((res) => {
       formData.data.contractProductData = res.data.map((x) => ({
         ...x,
-        waitQuantity: Number(x.cpQuantity) - Number(x.sumPackQuantity),
+        waitQuantity: (
+          Number(x.cpQuantity) - Number(x.sumPackQuantity)
+        ).toFixed(2),
         quantity: null,
       }));
       handleChangePackQuantity();

src/views/system/dept2/index.vue

@@ -230,12 +230,14 @@ const formConfig = computed(() => {
       label: proxy.t('dept.deptManager'),
       prop: "leaderId",
       itemWidth: 50,
+      clearable: true,
       data: [],
     },
     {
       type: "select",
       label: proxy.t('dept.deptDirector'),
       prop: "directorId",
+      clearable: true,
       itemWidth: 50,
       data: [],
     },
@@ -409,10 +411,7 @@ const getUserList = () => {
         item.label = item.nickName;
         item.id = item.userId;
       });
-      message.rows.unshift({
-        label:'无',
-        id:'',
-      })
+      
       formConfig.value[3].data = message.rows;
       formConfig.value[4].data = message.rows;