历史发货登记功能

src/components/TitleInfo/index.vue

@@ -29,7 +29,7 @@ export default {
     margin-top: 1px;
   }
   .content {
-    font-size: 13px;
+    font-size: 14px;
     font-weight: 600;
     color: #333333;
   }

src/views/WDLY/purchaseManage/alreadyPurchase/index.vue

@@ -51,15 +51,17 @@
       </byTable>
     </div>
     <el-dialog :title="modalType === 'add' ? '发货登记' : '到货通知'" v-model="dialogVisible" width="80%" destroy-on-close>
-      <byForm :formConfig="formConfig" :formOption="formOption" v-model="formData.data" :rules="rules" ref="byform" v-loading="submitLoading">
-        <template #detailSlot>
-          <div style="width: 100%">
-            <el-table :data="
+      <el-tabs v-model="activeName" class="demo-tabs" type="card" @tab-change="handleTabChange" v-if="modalType=='add'">
+        <el-tab-pane label="发货登记" name="1">
+          <byForm :formConfig="formConfig" :formOption="formOption" v-model="formData.data" :rules="rules" ref="byform" v-loading="submitLoading">
+            <template #detailSlot>
+              <div style="width: 100%">
+                <el-table :data="
                 modalType === 'add'
                   ? formData.data.deliverGoodsDetailsList
                   : formData.data.arrivalDetailList
               " show-summary :summary-method="getSummaries">
-              <el-table-column prop="productDefinition" label="物品类型" :formatter="
+                  <el-table-column prop="productDefinition" label="物品类型" :formatter="
                   (row) =>
                     row.productDefinition == 1
                       ? '产品'
@@ -68,43 +70,132 @@
                       : ''
                 " />
 
-              <el-table-column prop="productCode" label="物品编码" />
-              <el-table-column prop="productName" label="物品名称" />
-              <el-table-column prop="productSpec" label="规格" />
-              <el-table-column prop="productUnit" label="单位" :formatter="
+                  <el-table-column prop="productCode" label="物品编码" />
+                  <el-table-column prop="productName" label="物品名称" />
+                  <el-table-column prop="productSpec" label="规格" />
+                  <el-table-column prop="productUnit" label="单位" :formatter="
                   (row) => dictValueLabel(row.productUnit, productUnit)
                 " />
-              <el-table-column prop="count" label="采购数量" />
-              <el-table-column prop="alreadyDeliverGoodsQuantity" label="累计发货" v-if="modalType === 'add'" />
-              <el-table-column prop="deliverGoodsQuantity" label="本次发货" min-width="150" v-if="modalType === 'add'">
-                <template #default="{ row, $index }">
-                  <el-form-item :prop="
+                  <el-table-column prop="count" label="采购数量" />
+                  <el-table-column prop="alreadyDeliverGoodsQuantity" label="累计发货" v-if="modalType === 'add'" />
+                  <el-table-column prop="deliverGoodsQuantity" label="本次发货" min-width="150" v-if="modalType === 'add'">
+                    <template #default="{ row, $index }">
+                      <el-form-item :prop="
                       'deliverGoodsDetailsList.' +
                       $index +
                       '.deliverGoodsQuantity'
                     " :rules="rules.deliverGoodsQuantity" :inline-message="true">
-                    <el-input-number v-model="row.deliverGoodsQuantity" :precision="2" :controls="false" :min="0" onmousewheel="return false;" />
-                  </el-form-item>
+                        <el-input-number v-model="row.deliverGoodsQuantity" :precision="2" :controls="false" :min="0" onmousewheel="return false;" />
+                      </el-form-item>
+                    </template>
+                  </el-table-column>
+                  <el-table-column prop="transitQuantity" label="剩余在途" v-if="modalType === 'edit'" />
+                  <el-table-column prop="deliverGoodsQuantity" label="本次到货" min-width="150" v-if="modalType === 'edit'">
+                    <template #default="{ row, $index }">
+                      <el-form-item :prop="
+                      'arrivalDetailList.' + $index + '.deliverGoodsQuantity'
+                    " :rules="rules.deliverGoodsQuantity" :inline-message="true">
+                        <el-input-number v-model="row.deliverGoodsQuantity" :precision="2" :controls="false" :min="0" onmousewheel="return false;" />
+                      </el-form-item>
+                    </template>
+                  </el-table-column>
+                </el-table>
+              </div>
+            </template>
+          </byForm>
+        </el-tab-pane>
+        <el-tab-pane label="历史发货登记" name="2">
+          <div style="padding:0 20px">
+            <el-table :data="histroyRecordList" style="width: 100%">
+              <el-table-column type="expand">
+                <template #default="{row,$index}">
+                  <div style="padding:0 20px">
+                    <TitleInfo :content="'发货明细：'"></TitleInfo>
+                    <el-table :data="row.deliverGoodsDetailsList" border style="width: 100%;margin-top:10px">
+                      <el-table-column label="物品编码" prop="productCustomCode" />
+                      <el-table-column label="物品名称" prop="productName" />
+                      <el-table-column label="规格" prop="productSpec" />
+                      <el-table-column label="单位" prop="productUnit" />
+                      <el-table-column label="发货数量" prop="deliverGoodsQuantity" />
+                    </el-table>
+                  </div>
+                </template>
+              </el-table-column>
+              <el-table-column label="发货时间" prop="createTime">
+                <template #default="{row,$index}">
+                  <div style="width:100%">
+                    <span v-if="row.createTime">{{row.createTime.slice(0,10)}}</span>
+                  </div>
                 </template>
               </el-table-column>
-              <el-table-column prop="transitQuantity" label="剩余在途" v-if="modalType === 'edit'" />
-              <el-table-column prop="deliverGoodsQuantity" label="本次到货" min-width="150" v-if="modalType === 'edit'">
+              <el-table-column label="物流/快递公司" prop="logisticsCompanyName" />
+              <el-table-column label="主单号" prop="code" />
+              <el-table-column label="副单号" prop="subCode" />
+              <el-table-column label="操作" width="90" align="center">
                 <template #default="{ row, $index }">
-                  <el-form-item :prop="
-                      'arrivalDetailList.' + $index + '.deliverGoodsQuantity'
-                    " :rules="rules.deliverGoodsQuantity" :inline-message="true">
-                    <el-input-number v-model="row.deliverGoodsQuantity" :precision="2" :controls="false" :min="0" onmousewheel="return false;" />
-                  </el-form-item>
+                  <el-button type="primary" text @click="updateCodeInfo(row)">修改</el-button>
                 </template>
               </el-table-column>
             </el-table>
           </div>
-        </template>
-      </byForm>
+        </el-tab-pane>
+      </el-tabs>
+      <div v-else>
+        <byForm :formConfig="formConfig" :formOption="formOption" v-model="formData.data" :rules="rules" ref="byform" v-loading="submitLoading">
+          <template #detailSlot>
+            <div style="width: 100%">
+              <el-table :data="
+                modalType === 'add'
+                  ? formData.data.deliverGoodsDetailsList
+                  : formData.data.arrivalDetailList
+              " show-summary :summary-method="getSummaries">
+                <el-table-column prop="productDefinition" label="物品类型" :formatter="
+                  (row) =>
+                    row.productDefinition == 1
+                      ? '产品'
+                      : row.productDefinition == 2
+                      ? '物料'
+                      : ''
+                " />
+
+                <el-table-column prop="productCode" label="物品编码" />
+                <el-table-column prop="productName" label="物品名称" />
+                <el-table-column prop="productSpec" label="规格" />
+                <el-table-column prop="productUnit" label="单位" :formatter="
+                  (row) => dictValueLabel(row.productUnit, productUnit)
+                " />
+                <el-table-column prop="count" label="采购数量" />
+                <el-table-column prop="alreadyDeliverGoodsQuantity" label="累计发货" v-if="modalType === 'add'" />
+                <el-table-column prop="deliverGoodsQuantity" label="本次发货" min-width="150" v-if="modalType === 'add'">
+                  <template #default="{ row, $index }">
+                    <el-form-item :prop="
+                      'deliverGoodsDetailsList.' +
+                      $index +
+                      '.deliverGoodsQuantity'
+                    " :rules="rules.deliverGoodsQuantity" :inline-message="true">
+                      <el-input-number v-model="row.deliverGoodsQuantity" :precision="2" :controls="false" :min="0" onmousewheel="return false;" />
+                    </el-form-item>
+                  </template>
+                </el-table-column>
+                <el-table-column prop="transitQuantity" label="剩余在途" v-if="modalType === 'edit'" />
+                <el-table-column prop="deliverGoodsQuantity" label="本次到货" min-width="150" v-if="modalType === 'edit'">
+                  <template #default="{ row, $index }">
+                    <el-form-item :prop="
+                      'arrivalDetailList.' + $index + '.deliverGoodsQuantity'
+                    " :rules="rules.deliverGoodsQuantity" :inline-message="true">
+                      <el-input-number v-model="row.deliverGoodsQuantity" :precision="2" :controls="false" :min="0" onmousewheel="return false;" />
+                    </el-form-item>
+                  </template>
+                </el-table-column>
+              </el-table>
+            </div>
+          </template>
+        </byForm>
+      </div>
 
       <template #footer>
         <el-button @click="dialogVisible = false" size="large">取 消</el-button>
-        <el-button type="primary" @click="submitForm()" size="large" :loading="submitLoading">
+        <el-button type="primary" @click="submitForm()" size="large" :loading="submitLoading" v-if="activeName=='1'">
           确 定
         </el-button>
       </template>
@@ -305,28 +396,6 @@
       </template>
     </el-dialog>
 
-    <!-- <el-drawer v-model="dialogVisibleThree" direction="rtl">
-      <template #header>
-        <h4>高级检索</h4>
-      </template>
-      <template #default>
-        <byForm
-          :formConfig="formConfig"
-          :formOption="ListOption"
-          v-model="sourceList.pagination"
-        >
-          <template #slot> 可自定义所需功能 </template>
-        </byForm>
-      </template>
-      <template #footer>
-        <div style="flex: auto">
-          <el-button @click="handleReset" size="large">重置</el-button>
-          <el-button @click="handleQuery" type="primary" size="large"
-            >搜索</el-button
-          >
-        </div>
-      </template>
-    </el-drawer> -->
     <el-dialog :title="'修改合同'" v-model="purchaseDialog" width="1200" destroy-on-close>
       <byForm :formConfig="purchaseFormConfig" :formOption="formOption" v-model="formData.purchaseData" :rules="purchaseFormRules" ref="purchaseDom">
         <template #details>
@@ -416,6 +485,7 @@
         </el-button>
       </template>
     </el-dialog>
+
     <el-dialog :title="'付款明细'" v-model="payDialog" width="600" destroy-on-close>
       <div>
         <el-timeline :reverse="false">
@@ -493,6 +563,17 @@
       </template>
     </el-dialog>
 
+    <el-dialog :title="'修改物流/快递信息'" v-model="updateRecordsDialog" width="600" destroy-on-close>
+      <byForm :formConfig="histroyRecordFormConfig" :formOption="formOption" v-model="formData.histroyRecordData" :rules="histroyRules"
+              ref="histryByform" v-loading="submitLoading">
+      </byForm>
+      <template #footer>
+        <el-button @click="updateRecordsDialog = false" size="large">取 消</el-button>
+        <el-button type="primary" @click="submitUpdateRecordForm()" size="large" :loading="submitLoading">
+          确 定
+        </el-button>
+      </template>
+    </el-dialog>
   </div>
 </template>
   
@@ -501,7 +582,7 @@ import { ElMessage, ElMessageBox } from "element-plus";
 import byTable from "@/components/byTable/index";
 import byForm from "@/components/byForm/index";
 import ArrivalDetails from "@/views/WDLY/purchaseManage/com/ArrivalDetails.vue";
-
+import TitleInfo from "@/components/TitleInfo/index.vue";
 import { computed } from "vue";
 import selectCity from "@/components/selectCity/index.vue";
 import useUserStore from "@/store/modules/user";
@@ -536,7 +617,12 @@ let rules = ref({
   ],
   aa: [{ required: true, message: "请输入退货数量", trigger: "blur" }],
 });
-
+const histroyRules = ref({
+  logisticsCompanyCode: [
+    { required: true, message: "请选择物流/快递公司", trigger: "change" },
+  ],
+  code: [{ required: true, message: "请输入物流/快递主单号", trigger: "blur" }],
+});
 let rulesTwo = ref({
   contacts: [{ required: true, message: "请输入收件人", trigger: "blur" }],
   phone: [{ required: true, message: "请输入联系电话", trigger: "blur" }],
@@ -753,6 +839,7 @@ let formData = reactive({
   dataOne: {},
   dataTwo: {},
   purchaseData: {},
+  histroyRecordData: {},
 });
 const formOption = reactive({
   inline: true,
@@ -776,6 +863,33 @@ const byform = ref(null);
 const byformTwo = ref(null);
 let formConfig = reactive([]);
 
+const histroyRecordFormConfig = computed(() => [
+  {
+    type: "select",
+    label: "物流/快递公司",
+    prop: "logisticsCompanyCode",
+    filterable: true,
+    data: logisticsData.value,
+    itemWidth: 100,
+    style: {
+      width: "100%",
+    },
+  },
+  {
+    type: "input",
+    label: "物流/快递主单号",
+    prop: "code",
+    // placeholder: "物流/快递单号",
+    itemWidth: 100,
+  },
+  {
+    type: "input",
+    label: "物流/快递副单号",
+    prop: "subCode",
+    // placeholder: "物流/快递单号",
+    itemWidth: 100,
+  },
+]);
 let formConfigTwo = computed(() => [
   {
     type: "title",
@@ -904,13 +1018,20 @@ const configData = computed(() => [
     },
     {
       type: "input",
-      label: " ",
+      label: "物流主单号",
       prop: "code",
       placeholder: "物流/快递单号",
       itemWidth: 50,
     },
     {
       type: "input",
+      label: "物流副单号",
+      prop: "subCode",
+      placeholder: "物流/快递单号",
+      itemWidth: 50,
+    },
+    {
+      type: "input",
       label: "收/发件人手机号",
       prop: "phone",
       // placeholder: "物流/快递单号",
@@ -1137,7 +1258,22 @@ const handleEditOne = (row) => {
   });
 };
 
+const histroyRecordList = ref([]);
+const getDeliverGoodsData = () => {
+  proxy
+    .post("/deliverGoods/page", {
+      purchaseId: rowData.value.id,
+      pageNum: 1,
+      pageSize: 999,
+    })
+    .then((res) => {
+      histroyRecordList.value = res.rows;
+    });
+};
+const rowData = ref({});
 const handleArrival = (row, type) => {
+  rowData.value = row;
+  activeName.value = "1";
   modalType.value = type;
   if (type === "add") {
     formConfig = configData.value[0];
@@ -1159,6 +1295,8 @@ const handleArrival = (row, type) => {
       };
       dialogVisible.value = true;
     });
+
+    getDeliverGoodsData();
   } else if (type === "edit") {
     formConfig = configData.value[1];
     proxy.post("/deliverGoods/list", { id: row.id }).then((res) => {
@@ -1182,6 +1320,32 @@ const handleArrival = (row, type) => {
     });
   }
 };
+const updateRecordsDialog = ref(false);
+const histryByform = ref(null);
+const updateCodeInfo = (row) => {
+  formData.histroyRecordData = {
+    id: row.id,
+    logisticsCompanyCode: row.logisticsCompanyCode,
+    code: row.code,
+    subCode: row.subCode,
+  };
+  updateRecordsDialog.value = true;
+};
+
+const submitUpdateRecordForm = () => {
+  histryByform.value.handleSubmit(() => {
+    submitLoading.value = true;
+    proxy.post("/deliverGoods/edit", formData.histroyRecordData).then((res) => {
+      ElMessage({
+        message: `操作成功！`,
+        type: "success",
+      });
+      updateRecordsDialog.value = false;
+      submitLoading.value = false;
+      getDeliverGoodsData();
+    });
+  });
+};
 
 watch(
   () => formData.data.deliverGoodsId,
@@ -1939,6 +2103,8 @@ const submitUpdateCode = () => {
       });
   });
 };
+
+const activeName = ref("1");
 </script>
   
 <style lang="scss" scoped>

src/views/WDLY/purchaseManage/purchase/index.vue

@@ -2,7 +2,7 @@
   <div class="tenant">
     <!-- <Banner /> -->
     <div class="content">
-      <byTable :source="sourceList.data" :pageSizes="[10, 20, 30, 40, 50, 100, 200]" :pagination="sourceList.pagination" :config="config"
+      <byTable :source="sourceList.data" :pageSizes="[10, 20, 30, 40, 50, 100, 500]" :pagination="sourceList.pagination" :config="config"
                :loading="loading" highlight-current-row :selectConfig="selectConfig" :table-events="{
           //element talbe事件都能传
           select: (data) => selectRow(data, 'row'),