cz 1 year ago
parent
commit
86bb39ff91

+ 7 - 7
src/views/EHSD/saleContract/contractEHSD/index.vue

@@ -295,13 +295,13 @@ const config = computed(() => {
         "min-width": 140,
       },
     },
-    // {
-    //   attrs: {
-    //     label: "客户标签",
-    //     slot: "tags",
-    //     width: 180,
-    //   },
-    // },
+    {
+      attrs: {
+        label: "客户标签",
+        slot: "tags",
+        width: 180,
+      },
+    },
     {
       attrs: {
         label: "预付比例",

+ 7 - 7
src/views/EHSD/saleContract/sampleEHSD/index.vue

@@ -296,13 +296,13 @@ const config = computed(() => {
         "min-width": 220,
       },
     },
-    // {
-    //   attrs: {
-    //     label: "客户标签",
-    //     slot: "tags",
-    //     width: 180,
-    //   },
-    // },
+    {
+      attrs: {
+        label: "客户标签",
+        slot: "tags",
+        width: 180,
+      },
+    },
     {
       attrs: {
         label: "预付比例",

+ 192 - 46
src/views/salesMange/saleContract/salesDocumentary/index.vue

@@ -1,12 +1,28 @@
 <template>
   <div class="content">
-    <el-form :inline="true" :model="sourceList.pagination" class="demo-form-inline">
+    <el-form
+      :inline="true"
+      :model="sourceList.pagination"
+      class="demo-form-inline"
+    >
       <el-form-item label="销售合同号:" prop="code">
-        <el-input v-model="sourceList.pagination.code" placeholder="请输入销售合同号" />
+        <el-input
+          v-model="sourceList.pagination.code"
+          placeholder="请输入销售合同号"
+        />
       </el-form-item>
       <el-form-item label="业务员:" prop="userId">
-        <el-select v-model="sourceList.pagination.userId" placeholder="请选择业务员">
-          <el-option v-for="item in userList" :key="item.value" :label="item.label" :value="item.value"> </el-option>
+        <el-select
+          v-model="sourceList.pagination.userId"
+          placeholder="请选择业务员"
+        >
+          <el-option
+            v-for="item in userList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -14,23 +30,60 @@
       </el-form-item>
     </el-form>
     <div style="padding: 10px 20px; width: 100%; box-sizing: border-box">
-      <div style="width: 100%; display: flex; padding-bottom: 5px; overflow-x: auto" class="topScrollDom" @scroll="handleScroll($event, true)">
-        <div v-for="(item, index) in purchaseTrackType" :key="index" style="display: flex; align-items: center">
-          <div style="width: 200px; height: 80px; position: relative" @click="selectRegion(item)">
-            <div :class="selectRecordDocumentaryId === item.id ? 'regionSelect' : 'regionNoSelect'" style="cursor: pointer">
-              <div style="color: #333333; font-size: 13px; font-weight: 700">{{ item.count }}</div>
-              <div style="color: #333333; font-size: 12px; font-weight: 700">{{ item.name }}</div>
-              <div class="right-bottom" style="position: absolute; right: 0; bottom: 0">
+      <div
+        style="
+          width: 100%;
+          display: flex;
+          padding-bottom: 5px;
+          overflow-x: auto;
+        "
+        class="topScrollDom"
+        @scroll="handleScroll($event, true)"
+      >
+        <div
+          v-for="(item, index) in purchaseTrackType"
+          :key="index"
+          style="display: flex; align-items: center"
+        >
+          <div
+            style="width: 200px; height: 80px; position: relative"
+            @click="selectRegion(item)"
+          >
+            <div
+              :class="
+                selectRecordDocumentaryId === item.id
+                  ? 'regionSelect'
+                  : 'regionNoSelect'
+              "
+              style="cursor: pointer"
+            >
+              <div style="color: #333333; font-size: 13px; font-weight: 700">
+                {{ item.count }}
+              </div>
+              <div style="color: #333333; font-size: 12px; font-weight: 700">
+                {{ item.name }}
+              </div>
+              <div
+                class="right-bottom"
+                style="position: absolute; right: 0; bottom: 0"
+              >
                 {{ index + 1 }}
               </div>
             </div>
-            <el-icon class="beacon" v-if="index < purchaseTrackType.length - 1"><CaretRight /></el-icon>
+            <el-icon class="beacon" v-if="index < purchaseTrackType.length - 1"
+              ><CaretRight
+            /></el-icon>
           </div>
         </div>
       </div>
     </div>
     <div class="main-content" v-loading="loading">
-      <el-card class="box-card" v-for="(item, index) in sourceList.data" :key="index" style="margin-bottom: 20px">
+      <el-card
+        class="box-card"
+        v-for="(item, index) in sourceList.data"
+        :key="index"
+        style="margin-bottom: 20px"
+      >
         <template #header>
           <el-row>
             <el-col :span="4">
@@ -50,31 +103,79 @@
             </el-col>
           </el-row>
         </template>
-        <div style="overflow-x: auto; width: 100%" class="scrollDom" @scroll="handleScroll($event, false, index)">
+        <div
+          style="overflow-x: auto; width: 100%"
+          class="scrollDom"
+          @scroll="handleScroll($event, false, index)"
+        >
           <el-steps :space="200" align-center>
-            <el-step v-for="(itemType, key) in purchaseTrackType" :key="key" :title="itemType.name" :status="getStatus(itemType, item)" />
+            <el-step
+              v-for="(itemType, key) in purchaseTrackType"
+              :key="key"
+              :title="itemType.name"
+              :status="getStatus(itemType, item)"
+            />
           </el-steps>
           <div style="display: flex">
-            <div v-for="(itemType, key) in purchaseTrackType" :key="key" style="width: 200px !important; min-width: 200px !important">
+            <div
+              v-for="(itemType, key) in purchaseTrackType"
+              :key="key"
+              style="width: 200px !important; min-width: 200px !important"
+            >
               <div style="padding: 8px 0; text-align: center">
-                <el-icon style="color: #409eff; cursor: pointer" @click="clickAdd(item, itemType)"><EditPen /></el-icon>
+                <el-icon
+                  style="color: #409eff; cursor: pointer"
+                  @click="clickAdd(item, itemType)"
+                  ><EditPen
+                /></el-icon>
               </div>
-              <div style="text-align: center" v-if="item.documentaryRecord && item.documentaryRecord[itemType.id]">
+              <div
+                style="text-align: center"
+                v-if="
+                  item.documentaryRecord && item.documentaryRecord[itemType.id]
+                "
+              >
                 <el-tooltip class="box-item" effect="light" placement="bottom">
                   <template #content>
-                    <div style="max-width: 400px; max-height: 50vh; overflow-y: auto">
+                    <div
+                      style="
+                        max-width: 400px;
+                        max-height: 50vh;
+                        overflow-y: auto;
+                      "
+                    >
                       <el-timeline>
                         <el-timeline-item
-                          v-for="(activity, index) in item.documentaryRecord[itemType.id]"
+                          v-for="(activity, index) in item.documentaryRecord[
+                            itemType.id
+                          ]"
                           :key="index"
                           :timestamp="activity.createTime"
-                          :hide-timestamp="true">
+                          :hide-timestamp="true"
+                        >
                           <div style="background-color: #e2fbe8; padding: 8px">
-                            <div style="font-size: 12px">{{ activity.createTime }}</div>
-                            <div style="font-size: 12px" v-html="getStyle(activity.remark)"></div>
-                            <div v-if="activity.fileList && activity.fileList.length > 0">
-                              <div v-for="(file, index) in activity.fileList" :key="index">
-                                <a style="color: #409eff; cursor: pointer" @click="openFile(file.fileUrl)">{{ file.fileName }}</a>
+                            <div style="font-size: 12px">
+                              {{ activity.createTime }}
+                            </div>
+                            <div
+                              style="font-size: 12px"
+                              v-html="getStyle(activity.remark)"
+                            ></div>
+                            <div
+                              v-if="
+                                activity.fileList &&
+                                activity.fileList.length > 0
+                              "
+                            >
+                              <div
+                                v-for="(file, index) in activity.fileList"
+                                :key="index"
+                              >
+                                <a
+                                  style="color: #409eff; cursor: pointer"
+                                  @click="openFile(file.fileUrl)"
+                                  >{{ file.fileName }}</a
+                                >
                               </div>
                             </div>
                           </div>
@@ -82,7 +183,15 @@
                       </el-timeline>
                     </div>
                   </template>
-                  <span style="color: #409eff; cursor: pointer; padding: 8px 0; font-size: 12px">跟单详情</span>
+                  <span
+                    style="
+                      color: #409eff;
+                      cursor: pointer;
+                      padding: 8px 0;
+                      font-size: 12px;
+                    "
+                    >跟单详情</span
+                  >
                 </el-tooltip>
               </div>
             </div>
@@ -99,14 +208,32 @@
         :page-size="sourceList.pagination.pageSize"
         :total="sourceList.pagination.total"
         @size-change="handleSizeChange"
-        @current-change="handlePageChange" />
+        @current-change="handlePageChange"
+      />
     </el-row>
 
-    <el-dialog :title="title" v-if="dialogVisible" v-model="dialogVisible" width="600" v-loading="loadingDialog">
-      <byForm :formConfig="formConfig" :formOption="formOption" v-model="formData.data" :rules="rules" ref="submit">
+    <el-dialog
+      :title="title"
+      v-if="dialogVisible"
+      v-model="dialogVisible"
+      width="600"
+      v-loading="loadingDialog"
+    >
+      <byForm
+        :formConfig="formConfig"
+        :formOption="formOption"
+        v-model="formData.data"
+        :rules="rules"
+        ref="submit"
+      >
         <template #completionTime>
           <div>
-            <el-date-picker v-model="formData.data.completionTime" type="datetime" placeholder="请选择完成时间" value-format="YYYY-MM-DD HH:mm:ss" />
+            <el-date-picker
+              v-model="formData.data.completionTime"
+              type="datetime"
+              placeholder="请选择完成时间"
+              value-format="YYYY-MM-DD HH:mm:ss"
+            />
           </div>
         </template>
         <template #file>
@@ -117,7 +244,8 @@
               :data="uploadData"
               multiple
               :before-upload="uploadFile"
-              :on-preview="onPreviewFile">
+              :on-preview="onPreviewFile"
+            >
               <el-button>选择</el-button>
             </el-upload>
           </div>
@@ -125,7 +253,9 @@
       </byForm>
       <template #footer>
         <el-button @click="dialogVisible = false" size="large">取 消</el-button>
-        <el-button type="primary" @click="submitForm()" size="large">确 定</el-button>
+        <el-button type="primary" @click="submitForm()" size="large"
+          >确 定</el-button
+        >
       </template>
     </el-dialog>
   </div>
@@ -182,16 +312,22 @@ const handleScroll = (event, flag, index) => {
   }
 };
 const getDict = () => {
-  proxy.get("/tenantUser/list", { pageNum: 1, pageSize: 10000, tenantId: useUserStore().user.tenantId }).then((res) => {
-    if (res.rows && res.rows.length > 0) {
-      userList.value = res.rows.map((item) => {
-        return {
-          label: item.nickName,
-          value: item.userId,
-        };
-      });
-    }
-  });
+  proxy
+    .get("/tenantUser/list", {
+      pageNum: 1,
+      pageSize: 10000,
+      tenantId: useUserStore().user.tenantId,
+    })
+    .then((res) => {
+      if (res.rows && res.rows.length > 0) {
+        userList.value = res.rows.map((item) => {
+          return {
+            label: item.nickName,
+            value: item.userId,
+          };
+        });
+      }
+    });
 };
 const selectRecordDocumentaryId = ref("");
 const getList = () => {
@@ -235,7 +371,10 @@ const handlePageChange = (val) => {
 };
 const selectRegion = (item) => {
   sourceList.value.pagination.pageNum = 1;
-  if (selectRecordDocumentaryId.value && selectRecordDocumentaryId.value === item.id) {
+  if (
+    selectRecordDocumentaryId.value &&
+    selectRecordDocumentaryId.value === item.id
+  ) {
     selectRecordDocumentaryId.value = "";
   } else {
     selectRecordDocumentaryId.value = item.id;
@@ -243,7 +382,11 @@ const selectRegion = (item) => {
   getList();
 };
 const getStatus = (typeItem, row) => {
-  if (row.documentaryRecord && row.documentaryRecord[typeItem.id] && row.documentaryRecord[typeItem.id].length > 0) {
+  if (
+    row.documentaryRecord &&
+    row.documentaryRecord[typeItem.id] &&
+    row.documentaryRecord[typeItem.id].length > 0
+  ) {
     return "success";
   }
   return "process";
@@ -288,7 +431,9 @@ const formConfig = computed(() => {
   ];
 });
 const rules = ref({
-  completionTime: [{ required: true, message: "请选择完成时间", trigger: "change" }],
+  completionTime: [
+    { required: true, message: "请选择完成时间", trigger: "change" },
+  ],
 });
 const clickAdd = (item, row) => {
   title.value = "编辑: " + row.name;
@@ -299,6 +444,7 @@ const clickAdd = (item, row) => {
     remark: "",
     fileList: [],
   };
+  fileList.value = [];
   loadingDialog.value = false;
   dialogVisible.value = true;
 };

+ 7 - 18
src/views/salesMange/shipmentMange/packing/index.vue

@@ -689,21 +689,10 @@ const config = computed(() => {
         return [
           // {
           //   attrs: {
-          //     label: "打印",
-          //     type: "primary",
-          //     text: true,
-          //   },
-          //   el: "button",
-          //   click() {
-          //     getDtl(row);
-          //   },
-          // },
-          // {
-          //   attrs: {
           //     label: "删除",
           //     type: "primary",
           //     text: true,
-          //     disabled: row.status != 30,
+          //     disabled: false,
           //   },
           //   el: "button",
           //   click() {
@@ -718,9 +707,8 @@ const config = computed(() => {
           //     ).then(() => {
           //       // 删除
           //       proxy
-          //         .post("/subscribeDetail/edit", {
-          //           ...row,
-          //           status: 99,
+          //         .post("/pack/delete", {
+          //           id: row.packId,
           //         })
           //         .then((res) => {
           //           ElMessage({
@@ -913,7 +901,7 @@ const handleClickPacking = () => {
         const jele = formData.data.contractProductData[j];
         if (e.id === jele.id && e.quantity > Number(jele.waitQuantity)) {
           return ElMessage({
-            message: "装箱数量不可大于装箱数量",
+            message: "装箱数量不可大于装箱数量",
             type: "info",
           });
         }
@@ -1007,8 +995,6 @@ const handleChangePackQuantity = (val, index) => {
       }
     }
   }
-
-  // }
 };
 
 const handleCustomPush = (index) => {
@@ -1088,6 +1074,9 @@ getList();
 .tenant {
   padding: 20px;
 }
+:deep(.el-table__header-wrapper .el-checkbox) {
+  display: none;
+}
 .hidden-text {
   overflow: hidden;
   white-space: nowrap;