Merge branch 'stage' into dev0.3

src/components/PDF/contractPDF.vue

@@ -243,12 +243,14 @@ const getDict = () => {
 };
 getDict();
 watch(
-  props.rowData,
+  props,
   () => {
-    if (props.rowData.id) {
-      getPdfData({ id: props.rowData.id });
-    } else if (props.rowData.code) {
-      getPdfData({ code: props.rowData.code });
+    if (props.rowData) {
+      if (props.rowData.id) {
+        getPdfData({ id: props.rowData.id });
+      } else if (props.rowData.code) {
+        getPdfData({ code: props.rowData.code });
+      }
     }
   },
   {

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/contractCom/contractDetails.vue

@@ -20,7 +20,7 @@
           :style="{ color: currentItem.id === i.id ? '#409eff' : '' }"
           @click="handleItemClick(i)"
         >
-          <div v-if="activeName === 'first'">v {{ i.version }}</div>
+          <div v-if="activeName === 'first'">{{ i.code }}</div>
           <div v-if="activeName === 'second'">
             {{ i.code }}
           </div>
@@ -216,7 +216,7 @@ getDetailsData();
 .content-box {
   display: flex;
   .left {
-    width: 100px;
+    width: 160px;
     // background: #ccc;
     .left-item {
       height: 36px;
@@ -226,7 +226,7 @@ getDetailsData();
     }
   }
   .right {
-    width: calc(100% - 100px);
+    width: calc(100% - 160px);
     padding-left: 10px;
   }
 }

src/components/process/SendFunds.vue

@@ -605,8 +605,7 @@ const getDictData = () => {
     accountData.value = res.rows;
   });
   // 关联合同
-
-  proxy.post("/contract/page", { pageNum: 1, pageSize: 9999, status: 30 }).then((res) => {
+  proxy.post("/contract/page1", { pageNum: 1, pageSize: 9999, status: 30 }).then((res) => {
     contractList.value = res.rows;
   });
   // 部门树

src/components/process/SendPurchase.vue

@@ -720,10 +720,10 @@ const handleChangeAmount = () => {
 };
 
 const handleChangeMoney = (val, index, key) => {
-  let num = 100;
-  if (key === "count") {
-    num = 10000;
-  }
+  let num = 10000;
+  // if (key === "count") {
+  //   num = 10000;
+  // }
   formData.data.purchaseDetailList[index][key] = formatNumber(val, num);
   handleChangeAmount();
 };

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/finance/fundManage/accountPayment/index.vue

@@ -39,7 +39,7 @@
       </byForm>
       <template #footer>
         <el-button @click="dialogVisible = false" size="large">取 消</el-button>
-        <el-button type="primary" @click="submitForm()" size="large" :loading="submitLoading"> 确 定 </el-button>
+        <el-button type="primary" @click="submitForm()" v-if="!formOption.disabled" size="large" :loading="submitLoading"> 确 定 </el-button>
       </template>
     </el-dialog>
 

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" }],
@@ -437,7 +437,7 @@ const openModal = () => {
   modalType.value = "add";
   fileList.value = [];
   formData.data = {
-    type: "sales",
+    type: "",
     countryId: "44",
   };
   getCityData(formData.data.countryId, "20");
@@ -498,8 +498,12 @@ const getDtl = (row) => {
             };
           });
         }
-        getCityData(res.countryId, "20");
-        getCityData(res.provinceId, "30");
+        if (res.countryId) {
+          getCityData(res.countryId, "20");
+        }
+        if (res.provinceId) {
+          getCityData(res.provinceId, "30");
+        }
         res.type = res.type + "";
         formData.data = res;
         dialogVisible.value = true;

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>
@@ -89,7 +89,7 @@
       </template>
     </el-dialog>
 
-    <el-dialog title="合同详情" v-if="openDetailsDialog" v-model="openDetailsDialog" width="1000">
+    <el-dialog title="合同详情" v-if="openDetailsDialog" v-model="openDetailsDialog" width="1100">
       <ContractDetails :contractId="currentContractId"></ContractDetails>
     </el-dialog>
   </div>

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

@@ -9,7 +9,8 @@
         :selectConfig="selectConfig"
         highlight-current-row
         :action-list="[]"
-        @get-list="getList">
+        @get-list="getList"
+      >
         <template #amount="{ item }">
           <div>
             <span style="padding-right: 4px">{{ item.currency }}</span>
@@ -82,6 +83,7 @@ const sourceList = ref({
     pageSize: 10,
     keyword: "",
     sellCorporationId: "",
+    status: "30",
   },
 });
 const loading = ref(false);

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

@@ -412,7 +412,7 @@
               </td>
               <td style="text-align: center">{{ item.quantity }}</td>
               <td :rowspan="printDetails.documentsProducts.length" style="text-align: center" v-if="index === 0 && [1].includes(openStatus)">
-                {{ printDetails.sumBomVolume }}
+                {{ printDetails.sumNetWeight }}
               </td>
               <td :rowspan="printDetails.documentsProducts.length" style="text-align: center; border-right: 0" v-if="index === 0 && [1].includes(openStatus)">
                 {{ printDetails.sumRoughWeight }}

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

@@ -926,16 +926,18 @@ const handleChangePackQuantity = (val, index) => {
   const obj = {};
   for (let i = 0; i < formData.data.contractProductData.length; i++) {
     const e = formData.data.contractProductData[i];
-    obj[e.contractId + "_" + e.productId + ""] =
-      Number(e.cpQuantity) - Number(e.sumPackQuantity);
+    obj[e.contractId + "_" + e.productId + ""] = (
+      Number(e.cpQuantity) - Number(e.sumPackQuantity)
+    ).toFixed(2);
   }
   // 计算数量 即装箱数量 * 箱数 新增字段放在最外层
   for (let i = 0; i < formData.data.packDetailList.length; i++) {
     const ele = formData.data.packDetailList[i];
     for (let j = 0; j < ele.packDetailProductList.length; j++) {
       const jele = ele.packDetailProductList[j];
-      ele[jele.contractId + "_" + jele.productId + ""] =
-        Number(ele.packQuantity) * jele.quantity;
+      ele[jele.contractId + "_" + jele.productId + ""] = (
+        Number(ele.packQuantity) * jele.quantity
+      ).toFixed(2);
     }
   }
   // 计算新的待装箱数量
@@ -943,7 +945,7 @@ const handleChangePackQuantity = (val, index) => {
     const e = formData.data.packDetailList[i];
     for (const key in obj) {
       if (e.hasOwnProperty(key)) {
-        obj[key] = obj[key] - e[key];
+        obj[key] = (obj[key] - e[key]).toFixed(2);
         if (obj[key] < 0) {
           e.packQuantity = null;
           handleChangePackQuantity(null, index);
@@ -1008,7 +1010,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;