Prechádzať zdrojové kódy

采购到货通知bug解决

cz 2 rokov pred
rodič
commit
7f43dbbca1

+ 0 - 1
src/App.vue

@@ -17,7 +17,6 @@ export default {
     getBusinessDict({ current: 1, size: 999 }).then(
       (res) => {
         const list = res.data.data;
-        console.log(list, "aaa");
         window.localStorage.setItem("businessDict", JSON.stringify(list));
       },
       (err) => {

+ 9 - 0
src/api/purchase-management/deliver-goods/index.js

@@ -37,6 +37,15 @@ export function purchaseEnd(data = {}) {
 }
 
 // 查看
+export function lookSendGoodsDetails(data = {}) {
+  return request({
+    url: '/api/victoriatourist/logisticsInfo/deliverDetails',
+    method: 'post',
+    data: data,
+  })
+}
+
+// 查看
 export function purchaseDetails(data = {}) {
   return request({
     url: '/api/victoriatourist/purchase/flow/details',

+ 0 - 1
src/components/select-product/index.vue

@@ -133,7 +133,6 @@ export default {
       this.$emit("select", row);
     },
     handleQuery() {
-      console.log(this.req, "sss");
       this.getList();
     },
   },

+ 28 - 35
src/page/logs/index.vue

@@ -1,25 +1,19 @@
 <template>
-  <avue-crud :data="logsList"
-             :option="option">
+  <avue-crud :data="logsList" :option="option">
     <template slot="menuLeft">
-      <el-button type="primary"
-                 size="small"
-                 icon="el-icon-upload"
-                 @click="send">上传服务器</el-button>
-      <el-button type="danger"
-                 size="small"
-                 icon="el-icon-delete"
-                 @click="clear">清空本地日志</el-button>
+      <el-button type="primary" size="small" icon="el-icon-upload" @click="send"
+        >上传服务器</el-button
+      >
+      <el-button type="danger" size="small" icon="el-icon-delete" @click="clear"
+        >清空本地日志</el-button
+      >
     </template>
-    <template slot-scope="scope"
-              slot="type">
-      <el-tag type="danger"
-              size="small">{{scope.label}}</el-tag>
+    <template slot-scope="scope" slot="type">
+      <el-tag type="danger" size="small">{{ scope.label }}</el-tag>
     </template>
-    <template slot-scope="props"
-              slot="expand">
+    <template slot-scope="props" slot="expand">
       <pre class="code">
-        {{props.row.stack}}
+        {{ props.row.stack }}
       </pre>
     </template>
   </avue-crud>
@@ -49,40 +43,40 @@ export default {
             dicData: [
               {
                 label: "bug",
-                value: "error"
-              }
-            ]
+                value: "error",
+              },
+            ],
           },
           {
             label: "地址",
             width: 200,
             prop: "url",
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "内容",
             prop: "message",
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "错误堆栈",
             prop: "stack",
-            hide: true
+            hide: true,
           },
           {
             label: "时间",
             align: "center",
             prop: "time",
-            width: 200
-          }
-        ]
-      }
+            width: 200,
+          },
+        ],
+      },
     };
   },
   created() {},
   mounted() {},
   computed: {
-    ...mapGetters(["logsList"])
+    ...mapGetters(["logsList"]),
   },
   props: [],
   methods: {
@@ -90,14 +84,14 @@ export default {
       this.$confirm("确定上传本地日志到服务器?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
-        type: "warning"
+        type: "warning",
       })
         .then(() => {
           this.$store.dispatch("SendLogs").then(() => {
             this.$parent.$parent.box = false;
             this.$message({
               type: "success",
-              message: "发送成功!"
+              message: "发送成功!",
             });
           });
         })
@@ -107,20 +101,19 @@ export default {
       this.$confirm("确定清空本地日志记录?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
-        type: "warning"
+        type: "warning",
       })
         .then(() => {
           this.$store.commit("CLEAR_LOGS");
-          window.console.log(this);
           this.$parent.$parent.box = false;
           this.$message({
             type: "success",
-            message: "清空成功!"
+            message: "清空成功!",
           });
         })
         .catch(() => {});
-    }
-  }
+    },
+  },
 };
 </script>
 

+ 0 - 1
src/views/inbound-outbound/inbound/cgInbound/index.vue

@@ -90,7 +90,6 @@ export default {
       this.loading = true;
       API.purchaseInboundList(this.queryParams).then(
         (res) => {
-          console.log(res, "qq");
           this.tableList = res.data.data.records;
           this.total = res.data.data.total;
           this.loading = false;

+ 0 - 1
src/views/inbound-outbound/inbound/manualInbound/index.vue

@@ -83,7 +83,6 @@ export default {
       this.loading = true;
       API.manualInboundList(this.queryParams).then(
         (res) => {
-          console.log(res, "qq");
           this.tableList = res.data.data.records;
           this.total = res.data.data.total;
           this.loading = false;

+ 0 - 1
src/views/inbound-outbound/inbound/qualityTesting.vue

@@ -154,7 +154,6 @@ export default {
       this.loading = true;
       API.outboundList(this.queryParams).then(
         (res) => {
-          console.log(res, "qq");
           this.tableList = res.data.data.records;
           this.total = res.data.data.total;
           this.loading = false;

+ 0 - 1
src/views/inventory-management/check/index.vue

@@ -95,7 +95,6 @@ export default {
       this.loading = true;
       API.checkList(this.queryParams).then(
         (res) => {
-          console.log(res, "qq");
           this.tableList = res.data.data.records;
           this.total = res.data.data.total;
           this.loading = false;

+ 0 - 1
src/views/inventory-management/combination/index.vue

@@ -85,7 +85,6 @@ export default {
       this.loading = true;
       API.outboundList(this.queryParams).then(
         (res) => {
-          console.log(res, "qq");
           this.tableList = res.data.data.records;
           this.total = res.data.data.total;
           this.loading = false;

+ 0 - 27
src/views/inventory-management/query/index.vue

@@ -64,34 +64,7 @@ export default {
   methods: {
     getList() {
       this.loading = true;
-      // if (this.activeName === "first") {
-      //   console.log(1);
-      //   API.byWarehouseList(this.queryParams).then(
-      //     (res) => {
-      //       this.tableList = res.data.data.records;
-      //       this.total = res.data.data.total;
-      //       this.loading = false;
-      //     },
-      //     (err) => {
-      //       console.log("byWarehouseList: " + err);
-      //       this.loading = false;
-      //     }
-      //   );
-      // } else if (this.activeName === "second") {
-      //   console.log(2);
 
-      //   API.byProductList(this.queryParams).then(
-      //     (res) => {
-      //       this.tableList = res.data.data.records;
-      //       this.total = res.data.data.total;
-      //       this.loading = false;
-      //     },
-      //     (err) => {
-      //       console.log("byProductList: " + err);
-      //       this.loading = false;
-      //     }
-      //   );
-      // }
       switch (this.activeName) {
         case "first":
           API.byWarehouseList(this.queryParams).then(

+ 0 - 1
src/views/order-management/afterSales/index.vue

@@ -103,7 +103,6 @@ export default {
       this.loading = true;
       API.afterSalesList(this.queryParams).then(
         (res) => {
-          console.log(res, "ss");
           this.tableList = res.data.data.records;
           this.total = res.data.data.total;
           this.loading = false;

+ 208 - 116
src/views/process/processNode/index.vue

@@ -4,32 +4,81 @@
       <el-col :span="24">
         <el-card class="box-card">
           <div slot="header">
-            <span>{{ $t('process.processList') }}</span>
+            <span>{{ $t("process.processList") }}</span>
           </div>
-          <from-render ref="req" v-model="req" :form-config="queryForm"></from-render>
+          <from-render
+            ref="req"
+            v-model="req"
+            :form-config="queryForm"
+          ></from-render>
 
           <el-table :data="tableList" v-loading="loading">
-            <el-table-column :label="$t('process.generalProcess.serviceName')" prop="serviceName" width="300" />
-            <el-table-column :label="$t('process.generalProcess.moduleName')" prop="moduleName" width="300" />
-            <el-table-column :label="$t('process.generalProcess.codeName')" prop="name" />
-            <el-table-column :label="$t('process.generalProcess.version')" align="center" width="120">
+            <el-table-column
+              :label="$t('process.generalProcess.serviceName')"
+              prop="serviceName"
+              width="300"
+            />
+            <el-table-column
+              :label="$t('process.generalProcess.moduleName')"
+              prop="moduleName"
+              width="300"
+            />
+            <el-table-column
+              :label="$t('process.generalProcess.codeName')"
+              prop="name"
+            />
+            <el-table-column
+              :label="$t('process.generalProcess.version')"
+              align="center"
+              width="120"
+            >
               <template slot-scope="scope">
-                <span style="color: #409eff; cursor: pointer" @click="handleVersion(scope.row)">v{{ scope.row.versionNumber }}</span>
+                <span
+                  style="color: #409eff; cursor: pointer"
+                  @click="handleVersion(scope.row)"
+                  >v{{ scope.row.versionNumber }}</span
+                >
               </template>
             </el-table-column>
-            <el-table-column :label="$t('operation')" align="center" width="100">
+            <el-table-column
+              :label="$t('operation')"
+              align="center"
+              width="100"
+            >
               <template slot-scope="scope">
-                <el-button type="text" @click="handleNewVersion(scope.row)">{{ $t('process.generalProcess.newVersion') }}</el-button>
+                <el-button type="text" @click="handleNewVersion(scope.row)">{{
+                  $t("process.generalProcess.newVersion")
+                }}</el-button>
               </template>
             </el-table-column>
           </el-table>
-          <pagination v-show="total > 0" :total="total" :page.sync="req.pageNum" :limit.sync="req.pageSize" @pagination="getList" />
+          <pagination
+            v-show="total > 0"
+            :total="total"
+            :page.sync="req.pageNum"
+            :limit.sync="req.pageSize"
+            @pagination="getList"
+          />
 
-          <el-dialog :title="$t('process.generalProcess.add')" :visible.sync="open" width="30%">
-            <from-render ref="form" v-model="dialogParams" :form-config="dialogForm" :insideRules="dialogRules"></from-render>
+          <el-dialog
+            :title="$t('process.generalProcess.add')"
+            :visible.sync="open"
+            width="30%"
+          >
+            <from-render
+              ref="form"
+              v-model="dialogParams"
+              :form-config="dialogForm"
+              :insideRules="dialogRules"
+            ></from-render>
           </el-dialog>
 
-          <el-dialog :title="$t('process.generalProcess.change')" v-if="openChange" :visible.sync="openChange" width="30%">
+          <el-dialog
+            :title="$t('process.generalProcess.change')"
+            v-if="openChange"
+            :visible.sync="openChange"
+            width="30%"
+          >
             <div style="padding: 0 2vw">
               <el-form ref="rowData" :model="rowData" label-width="auto">
                 <el-form-item label="业务服务">
@@ -42,14 +91,28 @@
                   <span>{{ rowData.name }}</span>
                 </el-form-item>
                 <el-form-item label="切换版本">
-                  <el-select v-model="rowData.id" placeholder="请选择" style="width: 100%" size="small">
-                    <el-option v-for="item in versionList" :key="item.id" :label="item.name" :value="item.id" />
+                  <el-select
+                    v-model="rowData.id"
+                    placeholder="请选择"
+                    style="width: 100%"
+                    size="small"
+                  >
+                    <el-option
+                      v-for="item in versionList"
+                      :key="item.id"
+                      :label="item.name"
+                      :value="item.id"
+                    />
                   </el-select>
                 </el-form-item>
               </el-form>
               <div style="padding-top: 8px; text-align: center">
-                <el-button size="mini" @click="openChange = false">取 消</el-button>
-                <el-button type="primary" size="mini" @click="handleSubmit">确定</el-button>
+                <el-button size="mini" @click="openChange = false"
+                  >取 消</el-button
+                >
+                <el-button type="primary" size="mini" @click="handleSubmit"
+                  >确定</el-button
+                >
               </div>
             </div>
           </el-dialog>
@@ -60,54 +123,57 @@
 </template>
 
 <script>
-import * as API from '@/api/process/processNode.js'
-import { getServiceNameList, processInfoList } from '@/api/process/generalProcess.js'
-import fromRender from '@/components/form-test/index.vue'
+import * as API from "@/api/process/processNode.js";
+import {
+  getServiceNameList,
+  processInfoList,
+} from "@/api/process/generalProcess.js";
+import fromRender from "@/components/form-test/index.vue";
 
 export default {
-  name: 'equipment-management',
+  name: "equipment-management",
   components: { fromRender },
   data() {
     return {
       req: {
         pageNum: 1,
         pageSize: 10,
-        keyword: '',
-        serviceName: '',
+        keyword: "",
+        serviceName: "",
       },
       queryForm: {
         keyword: {
-          label: this.$t('keyword'),
+          label: this.$t("keyword"),
           span: 4,
         },
         serviceName: {
           span: 4,
-          label: this.$t('process.generalProcess.serviceName'),
-          type: 'select',
+          label: this.$t("process.generalProcess.serviceName"),
+          type: "select",
           data: [],
-          keyName: 'id',
-          labelName: 'name',
+          keyName: "id",
+          labelName: "name",
         },
         operation: {
           // 搜索按钮操作
           query: () => {
-            this.req.pageNum = 1
-            this.getList()
+            this.req.pageNum = 1;
+            this.getList();
           },
           // 重置按钮操作
           reset: () => {
-            this.$refs.req.reset()
-            this.getList()
+            this.$refs.req.reset();
+            this.getList();
           },
         },
         otherButton: {
           list: [
             {
-              name: this.$t('process.generalProcess.add'),
-              methodsText: 'add',
-              type: 'primary',
+              name: this.$t("process.generalProcess.add"),
+              methodsText: "add",
+              type: "primary",
               add: () => {
-                this.open = true
+                this.open = true;
               },
             },
           ],
@@ -117,178 +183,204 @@ export default {
       total: 0,
       loading: false,
       open: false,
-      title: '',
+      title: "",
       dialogParams: {
-        serviceName: '',
-        processInfoId: '',
-        name: '',
+        serviceName: "",
+        processInfoId: "",
+        name: "",
       },
       dialogForm: {
         loadingStatus: false,
         serviceName: {
-          label: this.$t('process.generalProcess.serviceName'),
-          type: 'select',
+          label: this.$t("process.generalProcess.serviceName"),
+          type: "select",
           data: [],
-          keyName: 'id',
-          labelName: 'name',
+          keyName: "id",
+          labelName: "name",
           change: (val) => {
-            this.dialogParams.processInfoId = ''
+            this.dialogParams.processInfoId = "";
             processInfoList({ serviceName: val }).then((res) => {
               this.dialogForm.processInfoId.data = res.data.data.map((item) => {
                 return {
                   id: item.id,
                   name: item.moduleName,
                   flowName: item.flowName,
-                }
-              })
-            })
+                };
+              });
+            });
           },
         },
         processInfoId: {
-          label: this.$t('process.generalProcess.moduleName'),
-          type: 'select',
+          label: this.$t("process.generalProcess.moduleName"),
+          type: "select",
           data: [],
-          keyName: 'id',
-          labelName: 'name',
+          keyName: "id",
+          labelName: "name",
           change: (val) => {
-            let data = this.dialogForm.processInfoId.data.filter((item) => item.id === val)
+            let data = this.dialogForm.processInfoId.data.filter(
+              (item) => item.id === val
+            );
             if (data && data.length > 0) {
-              this.dialogParams.name = data[0].flowName
+              this.dialogParams.name = data[0].flowName;
             }
           },
         },
         name: {
-          label: this.$t('process.generalProcess.flowName'),
-          type: 'input',
+          label: this.$t("process.generalProcess.flowName"),
+          type: "input",
         },
         otherButton: {
-          align: 'center',
+          align: "center",
           list: [
             {
-              name: this.$t('cancelText'),
-              methodsText: 'cancel',
+              name: this.$t("cancelText"),
+              methodsText: "cancel",
               cancel: () => {
-                this.$refs.form.reset()
-                this.open = false
+                this.$refs.form.reset();
+                this.open = false;
               },
             },
             {
-              name: this.$t('submitText'),
-              methodsText: 'submit',
-              type: 'primary',
+              name: this.$t("submitText"),
+              methodsText: "submit",
+              type: "primary",
               submit: () => {
-                this.handleSubmit()
+                this.handleSubmit();
               },
             },
           ],
         },
       },
       dialogRules: {
-        serviceName: [{ required: true, message: this.$t('process.generalProcess.serviceNameRules'), trigger: 'change' }],
-        processInfoId: [{ required: true, message: this.$t('process.generalProcess.moduleNameRules'), trigger: 'blur' }],
-        name: [{ required: true, message: this.$t('process.generalProcess.flowNameRules'), trigger: 'blur' }],
+        serviceName: [
+          {
+            required: true,
+            message: this.$t("process.generalProcess.serviceNameRules"),
+            trigger: "change",
+          },
+        ],
+        processInfoId: [
+          {
+            required: true,
+            message: this.$t("process.generalProcess.moduleNameRules"),
+            trigger: "blur",
+          },
+        ],
+        name: [
+          {
+            required: true,
+            message: this.$t("process.generalProcess.flowNameRules"),
+            trigger: "blur",
+          },
+        ],
       },
       rowData: {},
       openChange: false,
       versionList: [],
-    }
+    };
   },
   created() {
-    this.getServiceName()
+    this.getServiceName();
   },
   mounted() {
-    this.getList()
+    this.getList();
   },
   watch: {},
   methods: {
     getServiceName() {
       getServiceNameList({}).then((res) => {
-        const listData = []
+        const listData = [];
         for (let i = 0; i < res.data.data.length; i++) {
-          const element = res.data.data[i]
+          const element = res.data.data[i];
           listData.push({
             name: element,
             id: element,
-          })
+          });
         }
-        this.dialogForm.serviceName.data = listData
-        this.queryForm.serviceName.data = listData
-      })
+        this.dialogForm.serviceName.data = listData;
+        this.queryForm.serviceName.data = listData;
+      });
     },
     getList() {
-      this.loading = true
+      this.loading = true;
       API.processList({
         ...this.req,
-        bindingTenantId: '000000',
+        bindingTenantId: "000000",
       }).then(
         (res) => {
-          this.total = res.data.data.total
-          this.tableList = res.data.data.records
-          this.loading = false
+          this.total = res.data.data.total;
+          this.tableList = res.data.data.records;
+          this.loading = false;
         },
         (err) => {
-          console.log('processList: ' + err)
-          this.loading = false
-        },
-      )
+          console.log("processList: " + err);
+          this.loading = false;
+        }
+      );
     },
     handleSubmit() {
-      this.$refs.form.$refs['form'].validate((valid) => {
+      this.$refs.form.$refs["form"].validate((valid) => {
         if (valid) {
-          this.dialogForm.loadingStatus = true
+          this.dialogForm.loadingStatus = true;
           API.processAdd({
             ...this.dialogParams,
-            bindingTenantId: '000000',
+            bindingTenantId: "000000",
           }).then(
             () => {
-              this.msgSuccess(this.$t('addSuccess'))
-              this.$refs.form.reset()
-              this.open = false
-              this.dialogForm.loadingStatus = false
-              this.getList()
+              this.msgSuccess(this.$t("addSuccess"));
+              this.$refs.form.reset();
+              this.open = false;
+              this.dialogForm.loadingStatus = false;
+              this.getList();
             },
             (err) => {
-              console.log('processAdd: ' + err)
-              this.dialogForm.loadingStatus = false
-            },
-          )
+              console.log("processAdd: " + err);
+              this.dialogForm.loadingStatus = false;
+            }
+          );
         }
-      })
+      });
     },
     handleVersion(row) {
-      this.rowData = JSON.parse(JSON.stringify(row))
-      this.openChange = true
-      API.processGetVersionByProcessInfoId({ bindingTenantId: '000000', processInfoId: row.processInfoId }).then((res) => {
-        console.log(res)
+      this.rowData = JSON.parse(JSON.stringify(row));
+      this.openChange = true;
+      API.processGetVersionByProcessInfoId({
+        bindingTenantId: "000000",
+        processInfoId: row.processInfoId,
+      }).then((res) => {
         this.versionList = res.data.data.map((item) => {
           return {
             id: item.id,
-            name: 'v' + item.versionNumber,
-          }
-        })
-      })
+            name: "v" + item.versionNumber,
+          };
+        });
+      });
     },
     handleNewVersion(row) {
       this.$router.push({
-        path: '/nodeConfig',
+        path: "/nodeConfig",
         query: {
           id: row.id,
           processInfoId: row.processInfoId,
         },
-      })
+      });
     },
     handleSubmit() {
       if (!this.rowData.id) {
-        return this.msgInfo(this.$t('process.node.selectVersion'))
+        return this.msgInfo(this.$t("process.node.selectVersion"));
       }
-      API.processEditVersion({ processInfoId: this.rowData.processInfoId, bindingTenantId: '000000', id: this.rowData.id }).then(() => {
-        this.openChange = false
-        this.msgSuccess(this.$t('process.node.switchSuccess'))
-        this.getList()
-      })
+      API.processEditVersion({
+        processInfoId: this.rowData.processInfoId,
+        bindingTenantId: "000000",
+        id: this.rowData.id,
+      }).then(() => {
+        this.openChange = false;
+        this.msgSuccess(this.$t("process.node.switchSuccess"));
+        this.getList();
+      });
     },
   },
-}
+};
 </script>
   
   <style lang="scss" scoped>

+ 0 - 1
src/views/product-material/customer/addCustomer.vue

@@ -235,7 +235,6 @@ export default {
       handler(val, oldVal) {
         this.fileList = val.fileInfoList;
         this.fileList = this.fileList.map((x) => ({ name: x.fileName, ...x }));
-        // console.log(this.fileList, "aaa");
       },
       deep: true,
       immediate: true,

+ 1 - 3
src/views/product-material/material/addMaterial.vue

@@ -233,9 +233,7 @@ export default {
     handleCancel() {
       this.$emit("cancel");
     },
-    handleSuccess(response, file, fileList) {
-      console.log(fileList, "aa");
-    },
+    handleSuccess(response, file, fileList) {},
   },
 };
 </script>

+ 0 - 2
src/views/product-material/material/index.vue

@@ -287,14 +287,12 @@ export default {
       };
     },
     handleQuery() {
-      console.log(this.req, "sss");
       this.getList();
     },
     getList() {
       this.loading = true;
       API.materialList(this.req).then(
         (res) => {
-          console.log(res, "aaaa");
           this.tableList = res.data.data.records;
           this.total = res.data.data.total;
           this.loading = false;

+ 0 - 3
src/views/product-material/product/index.vue

@@ -484,7 +484,6 @@ export default {
       }
     },
     popoverDeptHide(data) {
-      console.log(data);
       // 部门数据处理
       this.req.deptId = data.id;
       this.handleQuery();
@@ -521,7 +520,6 @@ export default {
       this.getList();
     },
     handleQuery() {
-      console.log(this.req, "sss");
       this.getList();
     },
     getList() {
@@ -578,7 +576,6 @@ export default {
       this.open = true;
     },
     handleEdit(row) {
-      console.log(row, "ss");
       this.titleText = "edit";
       this.open = true;
       const data = { ...row };

+ 0 - 1
src/views/product-material/supply/addSupply.vue

@@ -298,7 +298,6 @@ export default {
       handler(val, oldVal) {
         this.fileList = val.fileInfoList;
         this.fileList = this.fileList.map((x) => ({ name: x.fileName, ...x }));
-        // console.log(this.fileList, "aaa");
       },
       deep: true,
       immediate: true,

+ 0 - 1
src/views/product-material/supply/priceMaintenance.vue

@@ -287,7 +287,6 @@ export default {
     this.supplyTypeList = businessDictData.find(
       (item) => item.code === "supplyType"
     ).children;
-    console.log(this.supplyTypeList);
     this.selectConfig[1].data = this.supplyTypeList.map((item) => ({
       label: item.dictValue,
       value: item.dictKey,

+ 31 - 20
src/views/purchase-management/deliver-goods/index.vue

@@ -127,16 +127,37 @@ export default {
       this.open = true;
       this.$nextTick(() => {
         this.$refs.sendGoods.loading = true;
-        API.purchaseDetails({ id: row.id }).then(
+        // API.purchaseDetails({ id: row.id }).then(
+        //   (res) => {
+        //     this.form.details = res.data.data.goodsList.map((x) => ({
+        //       goodsCode: x.goodsCode,
+        //       goodsName: x.goodsName,
+        //       quantity: x.quantity,
+        //       purchaseId: row.id,
+        //       applyPurchaseId: x.id,
+        //       shipmentQuantity: Number(x.quantity),
+        //     }));
+        //     this.$refs.sendGoods.loading = false;
+        //   },
+        //   (err) => {
+        //     this.$refs.sendGoods.loading = false;
+        //   }
+        // );
+        API.lookSendGoodsDetails({ id: row.id }).then(
           (res) => {
-            this.form.details = res.data.data.goodsList.map((x) => ({
-              goodsCode: x.goodsCode,
-              goodsName: x.goodsName,
-              quantity: x.quantity,
+            this.form.details = res.data.data.map((x) => ({
+              goodsCode: x.productCode,
+              goodsName: x.productName,
+              quantity: x.purchaseQuantity,
               purchaseId: row.id,
-              applyPurchaseId: x.id,
-              shipmentQuantity: Number(x.quantity),
+              applyPurchaseId: x.applyPurchaseId,
+              shipmentQuantity:
+                Number(x.purchaseQuantity) - Number(x.deliverQuantity) > 0
+                  ? Number(x.purchaseQuantity) - Number(x.deliverQuantity)
+                  : 0,
+              deliverQuantity: x.deliverQuantity,
             }));
+            console.log(this.form.details, "ass");
             this.$refs.sendGoods.loading = false;
           },
           (err) => {
@@ -144,18 +165,6 @@ export default {
           }
         );
       });
-      // this.$nextTick(() => {
-      //   this.$refs.sendGoods.loading = true;
-      //      API.logisticsSelectData({ id: row.id }).then(
-      //     (res) => {
-      //       console.log(res, "aa");
-      //       this.$refs.sendGoods.loading = false;
-      //     },
-      //     (err) => {
-      //       this.$refs.sendGoods.loading = false;
-      //     }
-      //   );
-      // });
     },
 
     handleCancel() {
@@ -193,6 +202,7 @@ export default {
           this.arriveForm = {
             code: row.code,
             supplierName: row.supplierName,
+            purchaseId: row.id,
             id: "",
           };
         },
@@ -228,7 +238,7 @@ export default {
     handleSubmit1() {
       this.$refs.arriveForm.validate((valid) => {
         if (valid) {
-          API.arrivalNotice({ id: this.arriveForm.id }).then(() => {
+          API.arrivalNotice(this.arriveForm).then(() => {
             this.msgSuccess("操作成功");
             this.getList();
             this.handleCancel1();
@@ -238,6 +248,7 @@ export default {
     },
     handleCancel1() {
       this.openArrive = false;
+      this.getList();
     },
     isSelectable(row) {
       if (row.status != 30) {

+ 11 - 1
src/views/purchase-management/deliver-goods/sendGoods.vue

@@ -79,9 +79,10 @@
             </el-table-column>
             <el-table-column label="物品名称" prop="goodsName">
             </el-table-column>
-
             <el-table-column label="采购数量" prop="quantity">
             </el-table-column>
+            <el-table-column label="已发货数量" prop="deliverQuantity">
+            </el-table-column>
 
             <el-table-column
               label="发货数量"
@@ -177,6 +178,15 @@ export default {
     handleSubmit() {
       this.$refs.form.validate((valid) => {
         if (valid) {
+          for (let i = 0; i < this.form.details.length; i++) {
+            const x = this.form.details[i];
+            if (
+              Number(x.deliverQuantity) + Number(x.shipmentQuantity) >
+              Number(x.quantity)
+            ) {
+              return this.msgInfo("已发货数量加发货数量不能大于采购数量!");
+            }
+          }
           const sum = this.form.details.reduce((sum, x) => {
             return sum + Number(x.shipmentQuantity);
           }, 0);

+ 0 - 1
src/views/purchase-management/returnsManagement/index.vue

@@ -85,7 +85,6 @@ export default {
       this.loading = true;
       API.outboundList(this.queryParams).then(
         (res) => {
-          console.log(res, "qq");
           this.tableList = res.data.data.records;
           this.total = res.data.data.total;
           this.loading = false;

+ 0 - 1
src/views/purchase-management/settlement/purchaseSettlement.vue

@@ -86,7 +86,6 @@ export default {
       this.loading = true;
       API.outboundList(this.queryParams).then(
         (res) => {
-          console.log(res, "qq");
           this.tableList = res.data.data.records;
           this.total = res.data.data.total;
           this.loading = false;

+ 0 - 1
src/views/purchase-management/subscribe/index.vue

@@ -82,7 +82,6 @@ export default {
     this.subscribeStatusList = businessDictData.find(
       (item) => item.code === "purchaseStatus"
     ).children;
-    console.log(this.subscribeStatusList);
     this.warehouseTypeList = businessDictData.find(
       (item) => item.code === "warehouseType"
     ).children;