cz 1 年之前
父節點
當前提交
a6354039c9

+ 0 - 1
src/components/process/EHSD/Purchase.vue

@@ -591,7 +591,6 @@
                       style="width: 100%"
                       :precision="2"
                       :controls="false"
-                      :min="0"
                     />
                   </el-form-item>
                 </div>

+ 0 - 1
src/components/process/EHSD/PurchaseChange.vue

@@ -585,7 +585,6 @@
                       style="width: 100%"
                       :precision="2"
                       :controls="false"
-                      :min="0"
                     />
                   </el-form-item>
                 </div>

+ 10 - 10
src/views/EHSD/saleContract/exportTracking/index.vue

@@ -297,23 +297,23 @@ const contractDocumentary = ref([]);
 const status = ref([
   {
     label: "待采购",
-    value: 0,
+    value: 10,
   },
   {
     label: "待出货",
-    value: 10,
+    value: 20,
   },
   {
     label: "已出货待收款",
-    value: 20,
+    value: 30,
   },
   {
     label: "已收款待出货",
-    value: 30,
+    value: 40,
   },
   {
     label: "已完成",
-    value: 60,
+    value: 50,
   },
 ]);
 const sourceList = ref({
@@ -331,6 +331,7 @@ const selectConfig = computed(() => {
   return [
     {
       label: "订单状态",
+      prop: "orderStatus",
       data: status.value,
     },
   ];
@@ -348,7 +349,7 @@ const config = computed(() => {
     {
       attrs: {
         label: "订单状态",
-        prop: "status",
+        prop: "orderStatus",
         width: 120,
         fixed: "left",
       },
@@ -662,7 +663,7 @@ const getRecordsData = () => {
       documentaryType: selectNode.value.value,
     })
     .then((res) => {
-      console.log(res, "asda");
+      recordsData.value = res.rows;
     });
 };
 const handleClickLook = (row, purchase, node) => {
@@ -675,7 +676,7 @@ const handleClickLook = (row, purchase, node) => {
 const handleClickAddRecord = () => {
   formData.recordsFormData = {
     purchaseId: purchaseData.value.id,
-    documentaryType: selectNode.value,
+    documentaryType: selectNode.value.value,
     documentaryTime: "",
     documentaryRemark: "",
     fileList: [],
@@ -697,14 +698,13 @@ const submitRecords = () => {
       }
     );
     proxy
-      .post("/contract/editContractRemark", formData.recordsFormData)
+      .post("/contractDocumentary/add", formData.recordsFormData)
       .then((res) => {
         ElMessage({
           message: "操作成功",
           type: "success",
         });
         getRecordsData();
-        getList();
         formLoading.value = false;
         openAddRecords.value = false;
       });

+ 1 - 1
src/views/customer/portrait/com/SalesDetails.vue

@@ -148,7 +148,7 @@ const config = computed(() => {
       attrs: {
         label: "合同金额",
         slot: "money",
-        width: 110,
+        width: 150,
       },
     },
     {