Browse Source

【修改】bug

howie 2 years ago
parent
commit
eb0ab91edb

+ 339 - 103
src/views/supply/direct/direct_list.vue

@@ -3,34 +3,57 @@
     <div v-show="!isShowDetail && !isShowExamine && !isShowForm">
       <!-- 筛选条件 -->
       <div class="screen-container">
-        <el-form ref="screenForm" :model="screenForm" label-width="100px" size="mini" label-position="left">
+        <el-form
+          ref="screenForm"
+          :model="screenForm"
+          label-width="100px"
+          size="mini"
+          label-position="left"
+        >
           <el-row :gutter="20">
             <el-col :xs="24" :sm="24" :lg="24">
               <el-form-item prop="status" label-width="0">
                 <el-radio-group v-model="screenForm.status" @change="getList()">
                   <el-radio-button label="">全部</el-radio-button>
-                  <el-radio-button v-for="(item, index) in statusList" :key="index" :label="item.value">{{item.label}}</el-radio-button>
+                  <el-radio-button
+                    v-for="(item, index) in statusList"
+                    :key="index"
+                    :label="item.value"
+                    >{{ item.label }}</el-radio-button
+                  >
                 </el-radio-group>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="直接调拨单号" prop="orderNum">
-                <el-input v-model="screenForm.orderNum" placeholder="请输入直接调拨单号"></el-input>
+                <el-input
+                  v-model="screenForm.orderNum"
+                  placeholder="请输入直接调拨单号"
+                ></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="仓库" prop="warehouse">
-                <el-input v-model="screenForm.warehouse" placeholder="请输入仓库"></el-input>
+                <el-input
+                  v-model="screenForm.warehouse"
+                  placeholder="请输入仓库"
+                ></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="经销商编码" prop="jxsNum">
-                <el-input v-model="screenForm.jxsNum" placeholder="请输入经销商编码"></el-input>
+                <el-input
+                  v-model="screenForm.jxsNum"
+                  placeholder="请输入经销商编码"
+                ></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="经销商名称" prop="jxsName">
-                <el-input v-model="screenForm.jxsName" placeholder="请输入经销商名称"></el-input>
+                <el-input
+                  v-model="screenForm.jxsName"
+                  placeholder="请输入经销商名称"
+                ></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
@@ -39,28 +62,37 @@
                   v-model="screenForm.date"
                   type="datetimerange"
                   range-separator="至"
-                  style="width: 100%;"
+                  style="width: 100%"
                   value-format="yyyy-MM-dd HH:mm:ss"
                   start-placeholder="开始日期"
-                  end-placeholder="结束日期">
+                  end-placeholder="结束日期"
+                >
                 </el-date-picker>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="产品名称" prop="chName">
-                <el-input v-model="screenForm.chName" placeholder="请输入产品名称"></el-input>
+                <el-input
+                  v-model="screenForm.chName"
+                  placeholder="请输入产品名称"
+                ></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="规格型号" prop="model">
-                <el-input v-model="screenForm.model" placeholder="请输入规格型号"></el-input>
+                <el-input
+                  v-model="screenForm.model"
+                  placeholder="请输入规格型号"
+                ></el-input>
               </el-form-item>
             </el-col>
 
             <el-col :xs="24" :sm="12" :lg="6" class="tr">
               <el-form-item label="">
                 <el-button @click="resetScreenForm">清空</el-button>
-                <el-button type="primary" @click="submitScreenForm">搜索</el-button>
+                <el-button type="primary" @click="submitScreenForm"
+                  >搜索</el-button
+                >
               </el-form-item>
             </el-col>
           </el-row>
@@ -70,87 +102,278 @@
       <div class="mymain-container">
         <div class="btn-group clearfix">
           <div class="fl">
-            <el-button size="mini" type="danger" icon="el-icon-minus" :disabled="multipleSelection.length < 1" @click="batchDelete()" v-if="$checkBtnRole('del', $route.meta.roles)">批量删除</el-button>
+            <el-button
+              size="mini"
+              type="danger"
+              icon="el-icon-minus"
+              :disabled="multipleSelection.length < 1"
+              @click="batchDelete()"
+              v-if="$checkBtnRole('del', $route.meta.roles)"
+              >批量删除</el-button
+            >
           </div>
           <div class="fr">
             <ExportButton :exUrl="'requisition/export'" :exParams="exParams" />
           </div>
         </div>
         <div class="table">
-          <el-table v-loading="listLoading" :data="dataList" element-loading-text="Loading" border fit highlight-current-row stripe @selection-change="handleSelectionChange">
-            <el-table-column align="center" type="selection" width="55"></el-table-column>
-            <el-table-column align="left" label="直接调拨单号" prop="id" min-width="190" show-overflow-tooltip>
+          <el-table
+            v-loading="listLoading"
+            :data="dataList"
+            element-loading-text="Loading"
+            border
+            fit
+            highlight-current-row
+            stripe
+            @selection-change="handleSelectionChange"
+          >
+            <el-table-column
+              align="center"
+              type="selection"
+              width="55"
+            ></el-table-column>
+            <el-table-column
+              align="left"
+              label="直接调拨单号"
+              prop="id"
+              min-width="190"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.id" />
-                <span>{{scope.row.id}}</span>
+                <span>{{ scope.row.id }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="订单号" prop="mainOrderId" min-width="140" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="订单号"
+              prop="mainOrderId"
+              min-width="140"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
-                <CopyButton :copyText="scope.row.orderType === 'TRADE' ||scope.row.orderType === 'HOME'  ? scope.row.enginOrderNo : scope.row.mainOrderId" />
-                <span>{{scope.row.orderType === 'TRADE'||scope.row.orderType === 'HOME' ? scope.row.enginOrderNo : scope.row.mainOrderId}}</span>
+                <CopyButton :copyText='scope.row.orderType === "TRADE" ||
+                scope.row.orderType === "HOME" || scope.row.orderType
+                ==="REQUISITION_TRADE" || scope.row.orderType
+                ==="REQUISITION_HOME"? scope.row.enginOrderNo:scope.row.mainOrderId' />
+                <span>{{
+                  scope.row.orderType === "TRADE" ||
+                  scope.row.orderType === "HOME" ||
+                  scope.row.orderType === "REQUISITION_TRADE" ||
+                  scope.row.orderType === "REQUISITION_HOME"
+                    ? scope.row.enginOrderNo
+                    : scope.row.mainOrderId
+                }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="审核状态" prop="examineStatus" min-width="100" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="审核状态"
+              prop="examineStatus"
+              min-width="100"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
-                {{scope.row.examineStatus | statusFilter}}
+                {{ scope.row.examineStatus | statusFilter }}
               </template>
             </el-table-column>
-            <el-table-column align="left" label="单据日期" prop="orderTime" min-width="160" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="经销商编码" prop="customerNumber" min-width="100" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="单据日期"
+              prop="orderTime"
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="left"
+              label="经销商编码"
+              prop="customerNumber"
+              min-width="100"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.customerNumber" />
-                <span>{{scope.row.customerNumber}}</span>
+                <span>{{ scope.row.customerNumber }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="经销商名称" prop="customerName" min-width="250" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="经销商名称"
+              prop="customerName"
+              min-width="250"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.customerName" />
-                <span>{{scope.row.customerName}}</span>
+                <span>{{ scope.row.customerName }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="调拨方向" prop="direction" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="物料编码" prop="materialCode" min-width="120" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="调拨方向"
+              prop="direction"
+              min-width="100"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="left"
+              label="物料编码"
+              prop="materialCode"
+              min-width="120"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.materialCode" />
-                <span>{{scope.row.materialCode}}</span>
+                <span>{{ scope.row.materialCode }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="产品编码" prop="materialOldNumber" min-width="140" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="产品编码"
+              prop="materialOldNumber"
+              min-width="140"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.materialOldNumber" />
-                <span>{{scope.row.materialOldNumber}}</span>
+                <span>{{ scope.row.materialOldNumber }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="产品名称"
+              prop="materialName"
+              min-width="160"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.materialName" />
-                <span>{{scope.row.materialName}}</span>
+                <span>{{ scope.row.materialName }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="规格型号" prop="specification" min-width="350" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="规格型号"
+              prop="specification"
+              min-width="350"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.specification" />
-                <span>{{scope.row.specification}}</span>
+                <span>{{ scope.row.specification }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="调拨数量" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="调出仓库" prop="correspondName" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="调出仓位" prop="stockName" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="调入仓库" prop="inCorrespondName" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="调入仓位" prop="inStockName" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="备注信息" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="制单人" prop="createBy" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="制单日期" prop="createTime" min-width="160" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="审核人" prop="approvalName" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="审核日期" prop="approvalTime" min-width="160" show-overflow-tooltip></el-table-column>
-            <el-table-column align="center" label="操作" width="180" fixed="right">
+            <el-table-column
+              align="left"
+              label="单位"
+              prop="unit"
+              min-width="100"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="left"
+              label="调拨数量"
+              prop="qty"
+              min-width="100"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="left"
+              label="调出仓库"
+              prop="correspondName"
+              min-width="100"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="left"
+              label="调出仓位"
+              prop="stockName"
+              min-width="100"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="left"
+              label="调入仓库"
+              prop="inCorrespondName"
+              min-width="100"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="left"
+              label="调入仓位"
+              prop="inStockName"
+              min-width="100"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="left"
+              label="备注信息"
+              prop="remark"
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="left"
+              label="制单人"
+              prop="createBy"
+              min-width="100"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="left"
+              label="制单日期"
+              prop="createTime"
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="left"
+              label="审核人"
+              prop="approvalName"
+              min-width="100"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="left"
+              label="审核日期"
+              prop="approvalTime"
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="操作"
+              width="180"
+              fixed="right"
+            >
               <template slot-scope="scope">
-                <el-button type="text" @click="toForm(scope.row)" v-if="$checkBtnRole('edit', $route.meta.roles) && scope.row.examineStatus === 'SAVE'">编辑</el-button>
-                <el-button type="text" @click="toExamine(scope.row)" v-if="$checkBtnRole('examine', $route.meta.roles) && scope.row.examineStatus === 'WAIT'">审单</el-button>
-                <el-button type="text" @click="toDetail(scope.row)">详情</el-button>
-                <el-popconfirm style="margin-left: 10px;" title="确定删除吗?" @onConfirm="handleDelete(scope.row.id)" v-if="$checkBtnRole('del', $route.meta.roles)">
+                <el-button
+                  type="text"
+                  @click="toForm(scope.row)"
+                  v-if="
+                    $checkBtnRole('edit', $route.meta.roles) &&
+                    scope.row.examineStatus === 'SAVE'
+                  "
+                  >编辑</el-button
+                >
+                <el-button
+                  type="text"
+                  @click="toExamine(scope.row)"
+                  v-if="
+                    $checkBtnRole('examine', $route.meta.roles) &&
+                    scope.row.examineStatus === 'WAIT'
+                  "
+                  >审单</el-button
+                >
+                <el-button type="text" @click="toDetail(scope.row)"
+                  >详情</el-button
+                >
+                <el-popconfirm
+                  style="margin-left: 10px"
+                  title="确定删除吗?"
+                  @onConfirm="handleDelete(scope.row.id)"
+                  v-if="$checkBtnRole('del', $route.meta.roles)"
+                >
                   <el-button slot="reference" type="text">删除</el-button>
                 </el-popconfirm>
               </template>
@@ -167,16 +390,28 @@
             :page-sizes="[10, 20, 30, 50]"
             :page-size="10"
             layout="total, sizes, prev, pager, next, jumper"
-            :total="listTotal">
+            :total="listTotal"
+          >
           </el-pagination>
         </div>
       </div>
     </div>
 
-    <DirectDetail :listItem="queryItem" v-if="isShowDetail" @backListFormDetail="backList" />
-    <DirectExamine :listItem="queryItem" v-if="isShowExamine" @backListFormDetail="backList" />
-    <DirectForm :listItem="queryItem" v-if="isShowForm" @backListFormDetail="backList" />
-
+    <DirectDetail
+      :listItem="queryItem"
+      v-if="isShowDetail"
+      @backListFormDetail="backList"
+    />
+    <DirectExamine
+      :listItem="queryItem"
+      v-if="isShowExamine"
+      @backListFormDetail="backList"
+    />
+    <DirectForm
+      :listItem="queryItem"
+      v-if="isShowForm"
+      @backListFormDetail="backList"
+    />
   </div>
 </template>
 
@@ -186,18 +421,18 @@ import DirectDetail from "@/views/supply/direct/components/direct_detail";
 import DirectExamine from "@/views/supply/direct/components/direct_examine";
 import DirectForm from "@/views/supply/direct/components/direct_form";
 
-let that
+let that;
 export default {
   components: {
     DirectDetail,
     DirectExamine,
-    DirectForm
+    DirectForm,
   },
   filters: {
     statusFilter(val) {
-      let obj = that.statusList.find(o => o.value == val);
-      return obj ? obj.label : ''
-    }
+      let obj = that.statusList.find((o) => o.value == val);
+      return obj ? obj.label : "";
+    },
   },
   data() {
     return {
@@ -206,22 +441,23 @@ export default {
       listTotal: 0, // 列表总数
       dataList: null, // 列表数据
       listLoading: false, // 列表加载loading
-      screenForm: { // 筛选表单数据
-        orderNum: '',
-        warehouse: '',
-        jxsNum: '',
-        jxsName: '',
-        date: '',
-        chName: '',
-        model: '',
-        status: '',
+      screenForm: {
+        // 筛选表单数据
+        orderNum: "",
+        warehouse: "",
+        jxsNum: "",
+        jxsName: "",
+        date: "",
+        chName: "",
+        model: "",
+        status: "",
       },
       statusList: [
-        { label: '已保存', value: 'SAVE' },
-        { label: '待审核', value: 'WAIT' },
-        { label: '审核通过', value: 'OK' },
+        { label: "已保存", value: "SAVE" },
+        { label: "待审核", value: "WAIT" },
+        { label: "审核通过", value: "OK" },
         //  // { label: '审核驳回', value: 'FAIL' },,
-        { label: '已关闭', value: 'CLOSE' },
+        { label: "已关闭", value: "CLOSE" },
       ],
 
       queryItem: {},
@@ -230,7 +466,7 @@ export default {
       isShowForm: false,
 
       multipleSelection: [],
-    }
+    };
   },
 
   computed: {
@@ -242,10 +478,10 @@ export default {
         customerName: this.screenForm.jxsName,
         productName: this.screenForm.chName,
         specification: this.screenForm.model,
-        startTime: this.screenForm.date ? this.screenForm.date[0] : '',
-        endTime: this.screenForm.date ? this.screenForm.date[1] : '',
+        startTime: this.screenForm.date ? this.screenForm.date[0] : "",
+        endTime: this.screenForm.date ? this.screenForm.date[1] : "",
         examineStatus: this.screenForm.status,
-      }
+      };
     },
   },
 
@@ -271,15 +507,15 @@ export default {
         customerName: this.screenForm.jxsName,
         productName: this.screenForm.chName,
         specification: this.screenForm.model,
-        startTime: this.screenForm.date ? this.screenForm.date[0] : '',
-        endTime: this.screenForm.date ? this.screenForm.date[1] : '',
+        startTime: this.screenForm.date ? this.screenForm.date[0] : "",
+        endTime: this.screenForm.date ? this.screenForm.date[1] : "",
         examineStatus: this.screenForm.status,
       };
       getList(params).then((res) => {
         this.dataList = res.data.records;
         this.listTotal = res.data.total;
         this.listLoading = false;
-      })
+      });
     },
 
     // 提交筛选表单
@@ -335,27 +571,29 @@ export default {
 
     // 删除
     handleDelete(id) {
-      deleteData({ids: id}).then(res => {
+      deleteData({ ids: id }).then((res) => {
         this.$successMsg();
         this.getList();
-      })
+      });
     },
 
-     // 批量删除
+    // 批量删除
     batchDelete() {
-      this.$confirm('此操作将永久删除, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        let ids = this.multipleSelection.map(item => {
-          return item.id;
-        });
-        deleteData({ids: ids.join(',')}).then(res => {
-          this.$successMsg();
-          this.getList();
+      this.$confirm("此操作将永久删除, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          let ids = this.multipleSelection.map((item) => {
+            return item.id;
+          });
+          deleteData({ ids: ids.join(",") }).then((res) => {
+            this.$successMsg();
+            this.getList();
+          });
         })
-      }).catch(() => {});
+        .catch(() => {});
     },
 
     handleSelectionChange(val) {
@@ -364,15 +602,13 @@ export default {
 
     // 申请/撤回
     handleSubmit(id, examineStatus) {
-      submitApply({id, examineStatus}).then(res => {
+      submitApply({ id, examineStatus }).then((res) => {
         this.$successMsg();
         this.getList();
-      })
+      });
     },
-  }
-}
+  },
+};
 </script>
 
-<style lang="scss" scoped>
-
-</style>
+<style lang="scss" scoped></style>

+ 1 - 1
src/views/supply/engin/components/home_detail.vue

@@ -278,7 +278,7 @@
         <el-table :data="deliverGoodsList" element-loading-text="Loading" border fit highlight-current-row stripe max-height="400">
           <el-table-column align="center" label="序号" type="index" width="50"></el-table-column>
           <el-table-column align="center" label="销售类型" prop="saleTypeName" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="产品编码" prop="materialNumber" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="物料编码" prop="materialNumber" min-width="160" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>

+ 369 - 170
src/views/supply/implement/nsales_list.vue

@@ -3,57 +3,92 @@
     <div v-show="!isShowDetail && !isShowExamine && !isShowReturnForm">
       <!-- 筛选条件 -->
       <div class="screen-container">
-        <el-form ref="screenForm" :model="screenForm" label-width="85px" size="mini" label-position="left">
+        <el-form
+          ref="screenForm"
+          :model="screenForm"
+          label-width="85px"
+          size="mini"
+          label-position="left"
+        >
           <el-row :gutter="20">
             <el-col :xs="24" :sm="24" :lg="24">
               <el-form-item prop="orderNum" label-width="0">
                 <el-radio-group v-model="screenForm.status" @change="getList()">
                   <el-radio-button label="">全部</el-radio-button>
-                  <el-radio-button v-for="(item, index) in statusList" :key="index" :label="item.value">{{item.label}}</el-radio-button>
+                  <el-radio-button
+                    v-for="(item, index) in statusList"
+                    :key="index"
+                    :label="item.value"
+                    >{{ item.label }}</el-radio-button
+                  >
                 </el-radio-group>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="发货单号" prop="orderNum">
-                <el-input v-model="screenForm.orderNum" placeholder="请输入发货单号"></el-input>
+                <el-input
+                  v-model="screenForm.orderNum"
+                  placeholder="请输入发货单号"
+                ></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="订单号" prop="mainOrderId">
-                <el-input v-model="screenForm.mainOrderId" placeholder="请输入订单号"></el-input>
+                <el-input
+                  v-model="screenForm.mainOrderId"
+                  placeholder="请输入订单号"
+                ></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="经销商名称" prop="jxsName">
-                <el-input v-model="screenForm.jxsName" placeholder="请输入经销商名称"></el-input>
+                <el-input
+                  v-model="screenForm.jxsName"
+                  placeholder="请输入经销商名称"
+                ></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="经销商编号" prop="jxsNum">
-                <el-input v-model="screenForm.jxsNum" placeholder="请输入规格型号"></el-input>
+                <el-input
+                  v-model="screenForm.jxsNum"
+                  placeholder="请输入规格型号"
+                ></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="产品名称" prop="chName">
-                <el-input v-model="screenForm.chName" placeholder="请输入产品名称"></el-input>
+                <el-input
+                  v-model="screenForm.chName"
+                  placeholder="请输入产品名称"
+                ></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="物料编码" prop="chNum">
-                <el-input v-model="screenForm.chNum" placeholder="请输入物料编码"></el-input>
+                <el-input
+                  v-model="screenForm.chNum"
+                  placeholder="请输入物料编码"
+                ></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="规格型号" prop="model">
-                <el-input v-model="screenForm.model" placeholder="请输入规格型号"></el-input>
+                <el-input
+                  v-model="screenForm.model"
+                  placeholder="请输入规格型号"
+                ></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="仓库名称" prop="warehouse">
-                <el-input v-model="screenForm.warehouse" placeholder="请输入仓库名称"></el-input>
+                <el-input
+                  v-model="screenForm.warehouse"
+                  placeholder="请输入仓库名称"
+                ></el-input>
               </el-form-item>
             </el-col>
-           <el-col :xs="24" :sm="12" :lg="6">
+            <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="单据日期" prop="date">
                 <el-date-picker
                   v-model="screenForm.date"
@@ -97,17 +132,10 @@
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="打印时间排序" prop="printDesc">
-                  <el-select v-model="screenForm.printDesc"  clearable filterable >
-                    <el-option
-                      label="默认"
-                      :value="null">
-                    </el-option>
-                    <el-option
-                      label="倒叙"
-                      :value="1">
-                    </el-option>
-                  </el-select>
-
+                <el-select v-model="screenForm.printDesc" clearable filterable>
+                  <el-option label="默认" :value="null"> </el-option>
+                  <el-option label="倒叙" :value="1"> </el-option>
+                </el-select>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
@@ -121,7 +149,9 @@
             <el-col :xs="24" :sm="12" :lg="18" class="tr">
               <el-form-item label="">
                 <el-button @click="resetScreenForm">清空</el-button>
-                <el-button type="primary" @click="submitScreenForm">搜索</el-button>
+                <el-button type="primary" @click="submitScreenForm"
+                  >搜索</el-button
+                >
               </el-form-item>
             </el-col>
           </el-row>
@@ -149,11 +179,18 @@
             stripe
             @selection-change="handleSelectionChange"
             show-summary
-            :summary-method="$getSummaries">
+            :summary-method="$getSummaries"
+          >
             <!-- <el-table-column align="center" type="selection" width="55"></el-table-column>-->
-            <el-table-column align="left" label="状态" prop="examineStatus" min-width="100" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="状态"
+              prop="examineStatus"
+              min-width="100"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
-                {{scope.row.examineStatus | statusFilter}}
+                {{ scope.row.examineStatus | statusFilter }}
               </template>
             </el-table-column>
             <el-table-column
@@ -163,7 +200,13 @@
               min-width="100"
               show-overflow-tooltip
             ></el-table-column>
-            <el-table-column align="left" label="订单类型" prop="orderType" min-width="100" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="订单类型"
+              prop="orderType"
+              min-width="100"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 {{ scope.row.orderType | orderTypeFilter }}
               </template>
@@ -173,91 +216,220 @@
                 {{scope.row.billStatus | billStatusFilter}}
               </template>
             </el-table-column> -->
-            <el-table-column align="left" label="发票号" prop="billReceipt" min-width="250" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="发票号"
+              prop="billReceipt"
+              min-width="250"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
-                {{scope.row.billReceipt }}
+                {{ scope.row.billReceipt }}
               </template>
             </el-table-column>
-            <el-table-column align="left" label="出库单号" prop="id" min-width="110" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="出库单号"
+              prop="id"
+              min-width="110"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.id" />
-                <span>{{scope.row.id}}</span>
+                <span>{{ scope.row.id }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="发货单号" prop="orderNo" min-width="130" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="发货单号"
+              prop="orderNo"
+              min-width="130"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.orderNo" />
-                <span>{{scope.row.orderNo}}</span>
+                <span>{{ scope.row.orderNo }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="订单号" prop="orderNo" min-width="140" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="订单号"
+              prop="orderNo"
+              min-width="140"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
-                <CopyButton :copyText="scope.row.orderType === 'TRADE' || scope.row.orderType === 'HOME' ? scope.row.enginOrderNo : scope.row.mainOrderId" />
-                <span>{{scope.row.orderType === 'TRADE' || scope.row.orderType === 'HOME' ? scope.row.enginOrderNo : scope.row.mainOrderId}}</span>
+                <CopyButton :copyText='scope.row.orderType === "TRADE" ||
+                scope.row.orderType === "HOME" || scope.row.orderType
+                ==="REQUISITION_TRADE" || scope.row.orderType
+                ==="REQUISITION_HOME"? scope.row.enginOrderNo:scope.row.mainOrderId' />
+                <span>{{
+                  scope.row.orderType === "TRADE" ||
+                  scope.row.orderType === "HOME" ||
+                  scope.row.orderType === "REQUISITION_TRADE" ||
+                  scope.row.orderType === "REQUISITION_HOME"
+                    ? scope.row.enginOrderNo
+                    : scope.row.mainOrderId
+                }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="仓库" prop="correspondName" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="经销商编码" prop="customerNumber" min-width="100" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="仓库"
+              prop="correspondName"
+              min-width="100"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="left"
+              label="经销商编码"
+              prop="customerNumber"
+              min-width="100"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.customerNumber" />
-                <span>{{scope.row.customerNumber}}</span>
+                <span>{{ scope.row.customerNumber }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="经销商名称" prop="customerName" min-width="250" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="经销商名称"
+              prop="customerName"
+              min-width="250"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.customerName" />
-                <span>{{scope.row.customerName}}</span>
+                <span>{{ scope.row.customerName }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="销售类型" prop="saleTypeName" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="物料编码" prop="materialCode" min-width="120" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="销售类型"
+              prop="saleTypeName"
+              min-width="100"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="left"
+              label="物料编码"
+              prop="materialCode"
+              min-width="120"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.materialCode" />
-                <span>{{scope.row.materialCode}}</span>
+                <span>{{ scope.row.materialCode }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="产品编码" prop="materialOldNumber" min-width="140" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="产品编码"
+              prop="materialOldNumber"
+              min-width="140"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.materialOldNumber" />
-                <span>{{scope.row.materialOldNumber}}</span>
+                <span>{{ scope.row.materialOldNumber }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="产品名称"
+              prop="materialName"
+              min-width="160"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.materialName" />
-                <span>{{scope.row.materialName}}</span>
+                <span>{{ scope.row.materialName }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="规格型号" prop="specification" min-width="350" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="规格型号"
+              prop="specification"
+              min-width="350"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.specification" />
-                <span>{{scope.row.specification}}</span>
+                <span>{{ scope.row.specification }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="right" label="数量" prop="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="right" label="单价" prop="price" min-width="100" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="单位"
+              prop="unit"
+              min-width="100"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="right"
+              label="数量"
+              prop="refundableQty"
+              min-width="100"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="right"
+              label="单价"
+              prop="price"
+              min-width="100"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 {{ scope.row.price | numToFixed }}
               </template>
             </el-table-column>
-            <el-table-column align="right" label="订单金额" prop="payAmount" min-width="100" show-overflow-tooltip>
+            <el-table-column
+              align="right"
+              label="订单金额"
+              prop="payAmount"
+              min-width="100"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 {{ scope.row.payAmount | numToFixed }}
               </template>
             </el-table-column>
             <el-table-column
               align="left"
-              label="制单人"
-              prop="createBy"
+              label="订单备注"
+              prop="headerRemark"
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="left"
+              label="发货申请备注"
+              prop="remark"
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="left"
+              label="表体备注"
+              prop="invoiceRemark"
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="left"
+              label="业务员"
+              prop="serviceName"
+              min-width="100"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="left"
+              label="表头业务员"
+              prop="k3ServiceName"
               min-width="100"
               show-overflow-tooltip
             ></el-table-column>
-            <el-table-column align="left" label="订单备注" prop="headerRemark" min-width="160" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="发货申请备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="表体备注" prop="invoiceRemark" min-width="160" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="业务员" prop="serviceName" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="表头业务员" prop="k3ServiceName" min-width="100" show-overflow-tooltip></el-table-column>
             <!-- <el-table-column align="center" label="操作" width="120" fixed="right">
               <template slot-scope="scope">
                 <el-button type="text" @click="toDetail(scope.row)">详情</el-button>
@@ -283,29 +455,49 @@
             :page-sizes="[10, 20, 30, 50]"
             :page-size="10"
             layout="total, sizes, prev, pager, next, jumper"
-            :total="listTotal">
+            :total="listTotal"
+          >
           </el-pagination>
         </div>
       </div>
     </div>
 
-    <ExamineDialog :isShow.sync="isShowExamineDialog" :examineForm.sync="examineForm" />
-
-    <SalesDetail :listItem="queryItem" v-if="isShowDetail" @backListFormDetail="backList" />
-    <SalesExamine :listItem="queryItem" v-if="isShowExamine" @backListFormExamine="backList" />
-    <SalesReturnForm :listItem="queryItem" v-if="isShowReturnForm" @backListFormDetail="backList" />
+    <ExamineDialog
+      :isShow.sync="isShowExamineDialog"
+      :examineForm.sync="examineForm"
+    />
 
+    <SalesDetail
+      :listItem="queryItem"
+      v-if="isShowDetail"
+      @backListFormDetail="backList"
+    />
+    <SalesExamine
+      :listItem="queryItem"
+      v-if="isShowExamine"
+      @backListFormExamine="backList"
+    />
+    <SalesReturnForm
+      :listItem="queryItem"
+      v-if="isShowReturnForm"
+      @backListFormDetail="backList"
+    />
   </div>
 </template>
 
 <script>
-import { abandonData, examineBatch, examineJudge, getList } from '@/api/supply/sales'
-import SalesDetail from '@/views/supply/sales/components/sales_detail'
-import SalesExamine from '@/views/supply/sales/components/sales_examine'
-import SalesReturnForm from '@/views/supply/sales/components/sales_return_form'
-import ExamineDialog from '@/components/Common/examine-dialog'
+import {
+  abandonData,
+  examineBatch,
+  examineJudge,
+  getList,
+} from "@/api/supply/sales";
+import SalesDetail from "@/views/supply/sales/components/sales_detail";
+import SalesExamine from "@/views/supply/sales/components/sales_examine";
+import SalesReturnForm from "@/views/supply/sales/components/sales_return_form";
+import ExamineDialog from "@/components/Common/examine-dialog";
 
-let that
+let that;
 export default {
   components: {
     SalesDetail,
@@ -315,8 +507,8 @@ export default {
   },
   filters: {
     statusFilter(val) {
-      let obj = that.statusList.find(o => o.value == val);
-      return obj ? obj.label : ''
+      let obj = that.statusList.find((o) => o.value == val);
+      return obj ? obj.label : "";
     },
     orderTypeFilter(val) {
       let obj = that.orderTypeList.find((o) => o.value == val);
@@ -324,11 +516,11 @@ export default {
     },
     billStatusFilter(val) {
       const MAP = {
-        1: '已开票',
-        0: '未开票',
-      }
+        1: "已开票",
+        0: "未开票",
+      };
       return MAP[val];
-    }
+    },
   },
   data() {
     return {
@@ -337,56 +529,57 @@ export default {
       listTotal: 0, // 列表总数
       dataList: null, // 列表数据
       listLoading: false, // 列表加载loading
-      screenForm: { // 筛选表单数据
-        orderNum: '',
-        jxsName: '',
-        jxsNum: '',
-        chName: '',
-        chNum: '',
-        model: '',
-        warehouse: '',
-        date: '',
-        status: '',
-        approval:'',
-        printTime:'',
-        mainOrderId: '',
-        printDesc:null,
-        id:''
+      screenForm: {
+        // 筛选表单数据
+        orderNum: "",
+        jxsName: "",
+        jxsNum: "",
+        chName: "",
+        chNum: "",
+        model: "",
+        warehouse: "",
+        date: "",
+        status: "",
+        approval: "",
+        printTime: "",
+        mainOrderId: "",
+        printDesc: null,
+        id: "",
       },
       statusList: [
-        { label: '已保存', value: 'SAVE' },
-        { label: '待审核', value: 'WAIT' },
-        { label: '审核通过', value: 'OK' },
-         // { label: '审核驳回', value: 'FAIL' },,
+        { label: "已保存", value: "SAVE" },
+        { label: "待审核", value: "WAIT" },
+        { label: "审核通过", value: "OK" },
+        // { label: '审核驳回', value: 'FAIL' },,
       ],
       orderTypeList: [
-        { label: '商用', value: 'TRADE' },
-        { label: '家用', value: 'HOME' },
-        { label: '零售单', value: 'RETAIL' },
-        { label: '销售政策单', value: 'RETAIL_POLICY' },
-        { label: '置换单家用', value: 'PERMU_HOME' },
-        { label: '置换商用', value: 'PERMU_TRADE' },
-        { label: '置换零售', value: 'PERMU_RETAIL' },
-        { label: '置换销售政策单', value: 'PERMU_RETAIL_POLICY' },
-        { label: '调拨单零售', value: 'REQUISITION_RETAIL' },
-        { label: '调拨单销售政策', value: 'REQUISITION_RETAIL_POLICY' },
-        { label: '调拨单商用', value: 'REQUISITION_TRADE' },
-        { label: '调拨单家用', value: 'REQUISITION_HOME' },
+        { label: "商用", value: "TRADE" },
+        { label: "家用", value: "HOME" },
+        { label: "零售单", value: "RETAIL" },
+        { label: "销售政策单", value: "RETAIL_POLICY" },
+        { label: "置换单家用", value: "PERMU_HOME" },
+        { label: "置换商用", value: "PERMU_TRADE" },
+        { label: "置换零售", value: "PERMU_RETAIL" },
+        { label: "置换销售政策单", value: "PERMU_RETAIL_POLICY" },
+        { label: "调拨单零售", value: "REQUISITION_RETAIL" },
+        { label: "调拨单销售政策", value: "REQUISITION_RETAIL_POLICY" },
+        { label: "调拨单商用", value: "REQUISITION_TRADE" },
+        { label: "调拨单家用", value: "REQUISITION_HOME" },
       ],
 
       queryItem: {},
       isShowDetail: false,
       isShowExamine: false,
       isShowReturnForm: false,
-  value1: "",
+      value1: "",
       choiceDate: "",
       multipleSelection: [],
       isShowExamineDialog: false,
       examineForm: {
-        status: '',
-        remark: '',
+        status: "",
+        remark: "",
       },
-       setDisabled: {
+      setDisabled: {
         disabledDate: (time) => {
           if (this.choiceDate) {
             const res = 13 * 24 * 3600 * 1000;
@@ -400,7 +593,7 @@ export default {
           if (maxDate) this.choiceDate = "";
         },
       },
-    }
+    };
   },
 
   computed: {
@@ -414,20 +607,24 @@ export default {
         materialNumber: this.screenForm.chNum,
         specification: this.screenForm.model,
         correspondName: this.screenForm.warehouse,
-        startTime: this.screenForm.date ? this.screenForm.date[0] : '',
-        endTime: this.screenForm.date ? this.screenForm.date[1] : '',
-         approvalStartTime: this.screenForm.approval ? this.screenForm.approval[0] : "",
-        approvalEndTime: this.screenForm.approval ? this.screenForm.approval[1] : "",
-          printStartTime:this.screenForm.printTime
+        startTime: this.screenForm.date ? this.screenForm.date[0] : "",
+        endTime: this.screenForm.date ? this.screenForm.date[1] : "",
+        approvalStartTime: this.screenForm.approval
+          ? this.screenForm.approval[0]
+          : "",
+        approvalEndTime: this.screenForm.approval
+          ? this.screenForm.approval[1]
+          : "",
+        printStartTime: this.screenForm.printTime
           ? this.screenForm.printTime[0]
           : "",
-          printEndtTime:this.screenForm.printTime
+        printEndtTime: this.screenForm.printTime
           ? this.screenForm.printTime[1]
           : "",
         mainOrderId: this.screenForm.mainOrderId,
-        printTimeDesc:this.screenForm.printDesc,
-        id:this.screenForm.id
-      }
+        printTimeDesc: this.screenForm.printDesc,
+        id: this.screenForm.id,
+      };
     },
   },
 
@@ -455,45 +652,47 @@ export default {
         materialNumber: this.screenForm.chNum,
         specification: this.screenForm.model,
         correspondName: this.screenForm.warehouse,
-        startTime: this.screenForm.date ? this.screenForm.date[0] : '',
-        endTime: this.screenForm.date ? this.screenForm.date[1] : '',
-         approvalStartTime: this.screenForm.approval ? this.screenForm.approval[0] : "",
-        approvalEndTime: this.screenForm.approval ? this.screenForm.approval[1] : "",
-          printStartTime:this.screenForm.printTime
+        startTime: this.screenForm.date ? this.screenForm.date[0] : "",
+        endTime: this.screenForm.date ? this.screenForm.date[1] : "",
+        approvalStartTime: this.screenForm.approval
+          ? this.screenForm.approval[0]
+          : "",
+        approvalEndTime: this.screenForm.approval
+          ? this.screenForm.approval[1]
+          : "",
+        printStartTime: this.screenForm.printTime
           ? this.screenForm.printTime[0]
           : "",
-          printEndtTime:this.screenForm.printTime
+        printEndtTime: this.screenForm.printTime
           ? this.screenForm.printTime[1]
           : "",
-          printTimeDesc:this.screenForm.printDesc,
+        printTimeDesc: this.screenForm.printDesc,
         mainOrderId: this.screenForm.mainOrderId,
-        id:this.screenForm.id
+        id: this.screenForm.id,
       };
       getList(params).then((res) => {
-        res.data.records.forEach(item => {
-          item.sums1 = ['refundableQty'];
-          item.sums2 = ['price', 'payAmount'];
-        })
+        res.data.records.forEach((item) => {
+          item.sums1 = ["refundableQty"];
+          item.sums2 = ["price", "payAmount"];
+        });
         this.dataList = res.data.records;
         this.listTotal = res.data.total;
         this.listLoading = false;
-      })
+      });
     },
-  updateReceipt() {
-
-    if (!this.value1) {
-      this.$errorMsg('请选择时间')
-      return
-    }
+    updateReceipt() {
+      if (!this.value1) {
+        this.$errorMsg("请选择时间");
+        return;
+      }
       updateReceipt({
-      startTime:this.value1[0],
-      endTime:this.value1[1]
-      }).then(res=>{
-         this.getList();
+        startTime: this.value1[0],
+        endTime: this.value1[1],
+      }).then((res) => {
+        this.getList();
         this.$successMsg("已更新");
-         this.value1 = ''
-      })
-
+        this.value1 = "";
+      });
     },
     // 提交筛选表单
     submitScreenForm() {
@@ -524,13 +723,15 @@ export default {
     // 判断是否可以审批
     async examineJudge(item) {
       // 获取页面模版
-      const result = await new Promise((resolve, reject)=>{
-        examineJudge({id: item.id}).then(res => {
-          resolve(res.code == 200);
-        }).catch(res => {
-          resolve(0);
-        })
-      })
+      const result = await new Promise((resolve, reject) => {
+        examineJudge({ id: item.id })
+          .then((res) => {
+            resolve(res.code == 200);
+          })
+          .catch((res) => {
+            resolve(0);
+          });
+      });
       return result;
     },
 
@@ -549,7 +750,7 @@ export default {
     // 进入审批
     async toExamine(item) {
       const canExamine = await this.examineJudge(item);
-      if(!canExamine) {
+      if (!canExamine) {
         return false;
       }
       this.queryItem = item;
@@ -574,31 +775,29 @@ export default {
 
     // 提交 批量审批
     submitExamineForm() {
-      let ids = this.multipleSelection.map(item => {
+      let ids = this.multipleSelection.map((item) => {
         return item.id;
       });
       examineBatch({
-        ids: ids.join(','),
+        ids: ids.join(","),
         examineStatus: this.examineForm.status,
         approvalRemark: this.examineForm.remark,
-      }).then(res => {
+      }).then((res) => {
         this.isShowExamineDialog = false;
         this.getList();
-        this.$successMsg('修改成功');
-      })
+        this.$successMsg("修改成功");
+      });
     },
 
     // 弃审
     handleAbandon(id) {
-      abandonData({id}).then(res => {
+      abandonData({ id }).then((res) => {
         this.$successMsg();
         this.getList();
-      })
+      });
     },
-  }
-}
+  },
+};
 </script>
 
-<style lang="scss" scoped>
-
-</style>
+<style lang="scss" scoped></style>

+ 18 - 18
src/views/supply/pickup/check.vue

@@ -248,17 +248,15 @@
               show-overflow-tooltip
             >
               <template slot-scope="scope">
-                <CopyButton
-                  :copyText="
-                    scope.row.orderType == 'HOME' ||
-                    scope.row.orderType == 'TRADE'
-                      ? scope.row.enginOrderNo
-                      : scope.row.mainOrderId
-                  "
-                />
+                <CopyButton :copyText='scope.row.orderType === "TRADE" ||
+                scope.row.orderType === "HOME" || scope.row.orderType
+                ==="REQUISITION_TRADE" || scope.row.orderType
+                ==="REQUISITION_HOME"? scope.row.enginOrderNo:scope.row.mainOrderId' />
                 <span>{{
-                  scope.row.orderType == "HOME" ||
-                  scope.row.orderType == "TRADE"
+                  scope.row.orderType === "TRADE" ||
+                  scope.row.orderType === "HOME" ||
+                  scope.row.orderType === "REQUISITION_TRADE" ||
+                  scope.row.orderType === "REQUISITION_HOME"
                     ? scope.row.enginOrderNo
                     : scope.row.mainOrderId
                 }}</span>
@@ -743,8 +741,8 @@ export default {
           }
         });
       } else {
-        this.getDateil(this.tableSelection, "getDtailPrintDis").then(res=>{
-          this.$endLoading()
+        this.getDateil(this.tableSelection, "getDtailPrintDis").then((res) => {
+          this.$endLoading();
           this.$refs.preView.show(this.hiprintTemplate, this.outputData);
         });
       }
@@ -765,14 +763,14 @@ export default {
             password: this.dialogForm.password,
           };
           checkPassword(params).then((res) => {
-            this.getDateil(this.tableSelection, "getDtailPrintDis").then(res=>{
-              this.$endLoading()
-              this.$refs.preView.show(this.hiprintTemplate, this.outputData);
-
-        });
+            this.getDateil(this.tableSelection, "getDtailPrintDis").then(
+              (res) => {
+                this.$endLoading();
+                this.$refs.preView.show(this.hiprintTemplate, this.outputData);
+              }
+            );
             this.cancelDialogForm();
           });
-
         }
       });
     },
@@ -796,5 +794,7 @@ export default {
 }
 .text {
   word-break: break-all !important;
+  height: 200px;
+  overflow-y: auto;
 }
 </style>

+ 286 - 127
src/views/supply/pickup/components/pickup_form.vue

@@ -1,36 +1,57 @@
 <template>
   <div class="detail-container">
-
-    <el-page-header @back="goBack" :content="listItem ? '编辑':'新增'"></el-page-header>
+    <el-page-header
+      @back="goBack"
+      :content="listItem ? '编辑' : '新增'"
+    ></el-page-header>
     <el-divider></el-divider>
 
     <div>
-      <el-form ref="mainForm" :model="mainForm" :rules="mainFormRules" label-width="80px" size="small" label-position="left">
+      <el-form
+        ref="mainForm"
+        :model="mainForm"
+        :rules="mainFormRules"
+        label-width="80px"
+        size="small"
+        label-position="left"
+      >
         <el-row :gutter="20">
           <el-col :xs="24" :sm="12" :lg="8">
             <el-form-item label="选择仓库" prop="warehouse">
-              <el-select v-model="mainForm.warehouse" placeholder="请选择仓库" style="width: 100%">
-                <el-option :label="item.name" :value="item.id" v-for="(item, index) in warehouseList" :key="index"></el-option>
+              <el-select
+                v-model="mainForm.warehouse"
+                placeholder="请选择仓库"
+                style="width: 100%"
+              >
+                <el-option
+                  :label="item.name"
+                  :value="item.id"
+                  v-for="(item, index) in warehouseList"
+                  :key="index"
+                ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="8">
-            <el-button size="small" type="primary" @click="getDeliverList">确定</el-button>
+            <el-button size="small" type="primary" @click="getDeliverList"
+              >确定</el-button
+            >
           </el-col>
         </el-row>
         <el-row :gutter="20">
-          <el-col :xs="24" :sm="12" :lg="8" style="height: 51px;">
+          <el-col :xs="24" :sm="12" :lg="8" style="height: 51px">
             <el-form-item label="预约日期" prop="date">
               <el-date-picker
                 v-model="mainForm.date"
                 type="date"
                 value-format="yyyy-MM-dd"
-                style="width: 100%;"
-                placeholder="选择日期">
+                style="width: 100%"
+                placeholder="选择日期"
+              >
               </el-date-picker>
             </el-form-item>
           </el-col>
-          <el-col :xs="24" :sm="12" :lg="12" style="height: 51px;">
+          <el-col :xs="24" :sm="12" :lg="12" style="height: 51px">
             <el-form-item label="预约时段" prop="timeSlot">
               <el-radio-group v-model="mainForm.timeSlot">
                 <el-radio :label="1">上午</el-radio>
@@ -43,28 +64,60 @@
           <el-col :xs="24" :sm="12" :lg="8">
             <el-form-item label="提货方式" prop="pickupWay">
               <el-radio-group v-model="mainForm.pickupWay">
-                <el-radio :label="item.dictCode" v-for="(item, index) in pickupWayList" :key="index">{{item.dictValue}}</el-radio>
+                <el-radio
+                  :label="item.dictCode"
+                  v-for="(item, index) in pickupWayList"
+                  :key="index"
+                  >{{ item.dictValue }}</el-radio
+                >
               </el-radio-group>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="8">
             <el-form-item label="提货人" prop="pickupMan">
-              <el-select v-model="mainForm.pickupMan" placeholder="全部" style="width: 100%">
-                <el-option :label="item.takerName" :value="item.id" v-for="(item, index) in pickupManList" :key="index"></el-option>
+              <el-select
+                v-model="mainForm.pickupMan"
+                placeholder="全部"
+                style="width: 100%"
+              >
+                <el-option
+                  :label="item.takerName"
+                  :value="item.id"
+                  v-for="(item, index) in pickupManList"
+                  :key="index"
+                ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="8" v-if="mainForm.pickupWay == '1'">
             <el-form-item label="提货车辆" prop="pickupCar">
-              <el-select v-model="mainForm.pickupCar" placeholder="全部" style="width: 100%">
-                <el-option :label="item.carBrand" :value="item.id" v-for="(item, index) in pickupCarList" :key="index"></el-option>
+              <el-select
+                v-model="mainForm.pickupCar"
+                placeholder="全部"
+                style="width: 100%"
+              >
+                <el-option
+                  :label="item.carBrand"
+                  :value="item.id"
+                  v-for="(item, index) in pickupCarList"
+                  :key="index"
+                ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="8" v-if="mainForm.pickupWay == '2'">
             <el-form-item label="物流公司" prop="company">
-              <el-select v-model="mainForm.company" placeholder="全部" style="width: 100%">
-                <el-option :label="item.logisticsCompany" :value="item.logisticsNumber" v-for="(item, index) in companyList" :key="index"></el-option>
+              <el-select
+                v-model="mainForm.company"
+                placeholder="全部"
+                style="width: 100%"
+              >
+                <el-option
+                  :label="item.logisticsCompany"
+                  :value="item.logisticsNumber"
+                  v-for="(item, index) in companyList"
+                  :key="index"
+                ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -72,7 +125,10 @@
         <el-row :gutter="20">
           <el-col :xs="24" :sm="24" :lg="24">
             <el-form-item label="备注内容" prop="remark">
-              <el-input v-model="mainForm.remark" placeholder="请输入备注内容"></el-input>
+              <el-input
+                v-model="mainForm.remark"
+                placeholder="请输入备注内容"
+              ></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -81,77 +137,176 @@
 
     <div class="mymain-container">
       <div class="table">
-        <el-table ref="table" v-loading="listLoading" :data="deliverList" element-loading-text="Loading" border fit highlight-current-row stripe @select="handleSelect" @select-all="handleSelectAll">
-          <el-table-column align="center" type="selection" width="55"></el-table-column>
-          <el-table-column align="left" label="发货申请单" prop="invoiceId" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="left" label="单据日期" prop="orderTime" min-width="120" show-overflow-tooltip>
+        <el-table
+          ref="table"
+          v-loading="listLoading"
+          :data="deliverList"
+          element-loading-text="Loading"
+          border
+          fit
+          highlight-current-row
+          stripe
+          @select="handleSelect"
+          @select-all="handleSelectAll"
+        >
+          <el-table-column
+            align="center"
+            type="selection"
+            width="55"
+          ></el-table-column>
+          <el-table-column
+            align="left"
+            label="发货申请单"
+            prop="invoiceId"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="left"
+            label="单据日期"
+            prop="orderTime"
+            min-width="120"
+            show-overflow-tooltip
+          >
             <template slot-scope="scope">
               {{ scope.row.orderTime | dateToDayFilter }}
             </template>
           </el-table-column>
-          <el-table-column align="left" label="销售订单号" prop="mainOrderId" min-width="160" show-overflow-tooltip>
+          <el-table-column
+            align="left"
+            label="销售订单号"
+            prop="mainOrderId"
+            min-width="160"
+            show-overflow-tooltip
+          >
             <template slot-scope="scope">
-              <CopyButton :copyText="(scope.row.orderType == 'HOME' || scope.row.orderType == 'TRADE') ? scope.row.enginOrderNo: scope.row.mainOrderId" />
-              <span>{{ (scope.row.orderType == 'HOME' || scope.row.orderType == 'TRADE') ? scope.row.enginOrderNo: scope.row.mainOrderId }}</span>
+              <CopyButton :copyText='scope.row.orderType === "TRADE" ||
+                scope.row.orderType === "HOME" || scope.row.orderType
+                ==="REQUISITION_TRADE" || scope.row.orderType
+                ==="REQUISITION_HOME"? scope.row.enginOrderNo:scope.row.mainOrderId' />
+              <span>{{
+                scope.row.orderType === "TRADE" ||
+                scope.row.orderType === "HOME" ||
+                scope.row.orderType === "REQUISITION_TRADE" ||
+                scope.row.orderType === "REQUISITION_HOME"
+                  ? scope.row.enginOrderNo
+                  : scope.row.mainOrderId
+              }}</span>
             </template>
           </el-table-column>
-          <el-table-column align="left" label="工程编号" prop="enginOrderNo" min-width="140" show-overflow-tooltip></el-table-column>
-          <el-table-column align="left" label="销售类型" prop="saleTypeName" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="left" label="物料编码" prop="materialCode" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="left" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="left" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="left" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="right" label="数量" prop="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
+          <!-- <el-table-column align="left" label="工程编号" prop="enginOrderNo" min-width="140" show-overflow-tooltip></el-table-column> -->
+          <el-table-column
+            align="left"
+            label="销售类型"
+            prop="saleTypeName"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="left"
+            label="物料编码"
+            prop="materialCode"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="left"
+            label="产品名称"
+            prop="materialName"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="left"
+            label="规格型号"
+            prop="specification"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="left"
+            label="单位"
+            prop="unit"
+            min-width="100"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="right"
+            label="数量"
+            prop="refundableQty"
+            min-width="100"
+            show-overflow-tooltip
+          ></el-table-column>
         </el-table>
       </div>
     </div>
 
     <div class="page-footer">
       <div class="footer" :class="classObj">
-        <el-button type="primary" @click="clickSubmitForm" :loading="formLoading">{{ formLoading ? '提交中 ...' : '提 交' }}</el-button>
-        <el-popconfirm title="确定重置吗?" @onConfirm="resetForm" style="margin-left: 10px;" v-if="!listItem">
+        <el-button
+          type="primary"
+          @click="clickSubmitForm"
+          :loading="formLoading"
+          >{{ formLoading ? "提交中 ..." : "提 交" }}</el-button
+        >
+        <el-popconfirm
+          title="确定重置吗?"
+          @onConfirm="resetForm"
+          style="margin-left: 10px"
+          v-if="!listItem"
+        >
           <el-button slot="reference">重 置</el-button>
         </el-popconfirm>
       </div>
     </div>
-
   </div>
 </template>
 
 <script>
-import { getWarehouseList, getDeliverList, getPickupManList, getPickupCarList, getCompanyList, addPickupBook, editPickupBook, getDetail, checkStock } from "@/api/supply/pickup";
+import {
+  getWarehouseList,
+  getDeliverList,
+  getPickupManList,
+  getPickupCarList,
+  getCompanyList,
+  addPickupBook,
+  editPickupBook,
+  getDetail,
+  checkStock,
+} from "@/api/supply/pickup";
 import { getDictList } from "@/api/common";
 
 export default {
-  name: 'PickupForm',
-  componentName: 'PickupForm',
-  props: ['listItem'],
+  name: "PickupForm",
+  componentName: "PickupForm",
+  props: ["listItem"],
   data() {
     return {
       deliverList: null, // 列表数据
       listLoading: false, // 列表加载loading
-      mainForm: { // 筛选表单数据
-        warehouse: '',
-        date: '',
-        timeSlot: '',
-        pickupWay: '',
-        pickupMan: '',
-        pickupCar: '',
-        company: '',
-        remark: '',
+      mainForm: {
+        // 筛选表单数据
+        warehouse: "",
+        date: "",
+        timeSlot: "",
+        pickupWay: "",
+        pickupMan: "",
+        pickupCar: "",
+        company: "",
+        remark: "",
       },
       mainFormRules: {
         date: [
-          { required: true, message: '请选择预约日期', trigger: 'change' }
+          { required: true, message: "请选择预约日期", trigger: "change" },
         ],
         timeSlot: [
-          { required: true, message: '请选择预约时段', trigger: 'change' }
+          { required: true, message: "请选择预约时段", trigger: "change" },
         ],
         pickupWay: [
-          { required: true, message: '请选择提货方式', trigger: 'change' }
+          { required: true, message: "请选择提货方式", trigger: "change" },
         ],
         pickupMan: [
-          { required: true, message: '请选择提货人', trigger: 'change' }
+          { required: true, message: "请选择提货人", trigger: "change" },
         ],
       },
       formLoading: false,
@@ -161,18 +316,18 @@ export default {
       pickupManList: [],
       pickupCarList: [],
       companyList: [],
-    }
+    };
   },
 
   computed: {
     sidebar() {
-      return this.$store.state.app.sidebar
+      return this.$store.state.app.sidebar;
     },
     classObj() {
       return {
         hideSidebar: !this.sidebar.opened,
-        openSidebar: this.sidebar.opened
-      }
+        openSidebar: this.sidebar.opened,
+      };
     },
   },
 
@@ -182,7 +337,7 @@ export default {
     this.getPickupManList();
     this.getPickupCarList();
     this.getCompanyList();
-    if(this.listItem) {
+    if (this.listItem) {
       this.getDetail();
     }
   },
@@ -194,17 +349,17 @@ export default {
       // if(!btnRole) {return true}
       // let index = btnRole.indexOf(value);
       // return index >= 0;
-      return true
+      return true;
     },
 
     // 返回列表
     goBack() {
-      this.$emit('backListFormDetail');
+      this.$emit("backListFormDetail");
     },
 
     // 获取详情
     getDetail() {
-      getDetail({id: this.listItem.id}).then(res => {
+      getDetail({ id: this.listItem.id }).then((res) => {
         let data = res.data;
         this.mainForm.warehouse = data.correspondId;
         this.mainForm.date = data.pickTime.slice(0, 10);
@@ -216,75 +371,75 @@ export default {
         this.mainForm.remark = data.remark;
 
         this.deliverList = data.invoicePickBeans;
-      })
+      });
     },
 
     // 获取仓库列表
     getWarehouseList() {
       getWarehouseList({
         pageNum: 1,
-        pageSize: -1
+        pageSize: -1,
       }).then((res) => {
         this.warehouseList = res.data.records;
-      })
+      });
     },
 
     // 获取提货方式列表
     getPickupWayList() {
-      getDictList({sysDictEnum: 'PICK'}).then(res => {
+      getDictList({ sysDictEnum: "PICK" }).then((res) => {
         this.pickupWayList = res.data;
-      })
+      });
     },
 
     // 获取提货人列表
     getPickupManList() {
       getPickupManList({
         pageNum: 1,
-        pageSize: -1
-      }).then(res => {
+        pageSize: -1,
+      }).then((res) => {
         this.pickupManList = res.data.records;
-      })
+      });
     },
 
     // 获取提货车辆列表
     getPickupCarList() {
       getPickupCarList({
         pageNum: 1,
-        pageSize: -1
-      }).then(res => {
+        pageSize: -1,
+      }).then((res) => {
         this.pickupCarList = res.data.records;
-      })
+      });
     },
 
     // 获取物流公司列表
     getCompanyList() {
       getCompanyList({
         pageNum: 1,
-        pageSize: -1
-      }).then(res => {
+        pageSize: -1,
+      }).then((res) => {
         this.companyList = res.data.records;
-      })
+      });
     },
 
     // 查询列表
     getDeliverList() {
-      if(!this.mainForm.warehouse) {
-        return this.$errorMsg('请选择仓库');
+      if (!this.mainForm.warehouse) {
+        return this.$errorMsg("请选择仓库");
       }
       this.listLoading = true;
-      getDeliverList({correspondId: this.mainForm.warehouse}).then((res) => {
+      getDeliverList({ correspondId: this.mainForm.warehouse }).then((res) => {
         this.deliverList = res.data;
         this.listLoading = false;
-      })
+      });
     },
 
     handleSelect(selection, row) {
       this.$refs.table.toggleRowSelection(row);
-      this.deliverList.forEach(item => {
+      this.deliverList.forEach((item) => {
         if (item.invoiceId === row.invoiceId) {
           this.$refs.table.toggleRowSelection(item);
         }
-      })
+      });
       this.tableSelection = this.$refs.table.selection;
     },
 
@@ -295,81 +450,88 @@ export default {
     clickSubmitForm() {
       this.$refs.mainForm.validate((valid) => {
         if (valid) {
-          if(this.tableSelection.length < 1) {
-            return this.$errorMsg('请选择发货申请单');
+          if (this.tableSelection.length < 1) {
+            return this.$errorMsg("请选择发货申请单");
           }
 
           let orderList = [];
-          this.tableSelection.forEach(item => {
+          this.tableSelection.forEach((item) => {
             orderList.push(item.invoiceOrderId);
           });
           let params = {
             correspondId: this.mainForm.warehouse,
-            pickTime: this.mainForm.date + ' 00:00:00',
-            invoiceOrderIds: orderList.join(','),
-          }
-          checkStock(params).then(res => {
-            if(res.data) {
-              this.$confirm(res.data, '提示', {
-                confirmButtonText: '确定',
-                cancelButtonText: '取消',
-                type: 'warning'
-              }).then(() => {
-                this.submitForm();
-              }).catch(() => {});
-            }else {
+            pickTime: this.mainForm.date + " 00:00:00",
+            invoiceOrderIds: orderList.join(","),
+          };
+          checkStock(params).then((res) => {
+            if (res.data) {
+              this.$confirm(res.data, "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+              })
+                .then(() => {
+                  this.submitForm();
+                })
+                .catch(() => {});
+            } else {
               this.submitForm();
             }
-          })
-
+          });
         }
-      })
+      });
     },
 
     submitForm() {
       this.formLoading = true;
 
-      let takerName = this.pickupManList.find(o => o.id == this.mainForm.pickupMan).takerName;
+      let takerName = this.pickupManList.find(
+        (o) => o.id == this.mainForm.pickupMan
+      ).takerName;
       // let correspondName = this.warehouseList.find(o => o.id == this.mainForm.warehouse).name;
 
       let orderList = [];
-      this.tableSelection.forEach(item => {
+      this.tableSelection.forEach((item) => {
         orderList.push(item.invoiceOrderId);
       });
       let params = {
         correspondId: this.mainForm.warehouse,
         // correspondName,
-        pickTime: this.mainForm.date + ' 00:00:00',
+        pickTime: this.mainForm.date + " 00:00:00",
         pickStatus: Number(this.mainForm.timeSlot),
         pickType: Number(this.mainForm.pickupWay),
         takerId: this.mainForm.pickupMan,
         takerName,
         remark: this.mainForm.remark,
         invoiceOrderIds: orderList,
-      }
-      if(this.mainForm.pickupWay == '1') {
+      };
+      if (this.mainForm.pickupWay == "1") {
         params.takerCarId = this.mainForm.pickupCar;
       }
-      if(this.mainForm.pickupWay == '2') {
+      if (this.mainForm.pickupWay == "2") {
         params.pickLogistics = this.mainForm.company;
       }
-      if(this.listItem) {
+      if (this.listItem) {
         params.id = this.listItem.id;
-        editPickupBook(params).then(res => {
-          this.$successMsg('提交成功');
-          this.goBack();
-          this.$parent.getList();
-        }).finally(res => {
-          this.formLoading = false;
-        })
-      }else {
-        addPickupBook(params).then(res => {
-          this.$successMsg('提交成功');
-          this.goBack();
-          this.$parent.getList();
-        }).finally(res => {
-          this.formLoading = false;
-        })
+        editPickupBook(params)
+          .then((res) => {
+            this.$successMsg("提交成功");
+            this.goBack();
+            this.$parent.getList();
+          })
+          .finally((res) => {
+            this.formLoading = false;
+          });
+      } else {
+        addPickupBook(params)
+          .then((res) => {
+            this.$successMsg("提交成功");
+            this.goBack();
+            this.$parent.getList();
+          })
+          .finally((res) => {
+            this.formLoading = false;
+          });
       }
     },
 
@@ -377,11 +539,8 @@ export default {
       this.$refs.mainForm.resetFields();
       this.deliverList = [];
     },
-
-  }
-}
+  },
+};
 </script>
 
-<style lang="scss" scoped>
-
-</style>
+<style lang="scss" scoped></style>

+ 243 - 71
src/views/supply/pickup/pickup_list.vue

@@ -3,21 +3,36 @@
     <div v-show="!isShowForm">
       <!-- 筛选条件 -->
       <div class="screen-container">
-        <el-form ref="screenForm" :model="screenForm" label-width="100px" size="mini" label-position="left">
+        <el-form
+          ref="screenForm"
+          :model="screenForm"
+          label-width="100px"
+          size="mini"
+          label-position="left"
+        >
           <el-row :gutter="20">
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="申请发货单号" prop="orderNum">
-                <el-input v-model="screenForm.orderNum" placeholder="请输入申请发货单号"></el-input>
+                <el-input
+                  v-model="screenForm.orderNum"
+                  placeholder="请输入申请发货单号"
+                ></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="申请人" prop="applyName">
-                <el-input v-model="screenForm.applyName" placeholder="请输入申请人"></el-input>
+                <el-input
+                  v-model="screenForm.applyName"
+                  placeholder="请输入申请人"
+                ></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="提货仓库" prop="warehouse">
-                <el-input v-model="screenForm.warehouse" placeholder="请输入提货仓库"></el-input>
+                <el-input
+                  v-model="screenForm.warehouse"
+                  placeholder="请输入提货仓库"
+                ></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
@@ -26,10 +41,11 @@
                   v-model="screenForm.date"
                   type="datetimerange"
                   range-separator="至"
-                  style="width: 100%;"
+                  style="width: 100%"
                   value-format="yyyy-MM-dd HH:mm:ss"
                   start-placeholder="开始日期"
-                  end-placeholder="结束日期">
+                  end-placeholder="结束日期"
+                >
                 </el-date-picker>
               </el-form-item>
             </el-col>
@@ -37,7 +53,9 @@
             <el-col :xs="24" :sm="24" :lg="24" class="tr">
               <el-form-item label="">
                 <el-button @click="resetScreenForm">清空</el-button>
-                <el-button type="primary" @click="submitScreenForm">搜索</el-button>
+                <el-button type="primary" @click="submitScreenForm"
+                  >搜索</el-button
+                >
               </el-form-item>
             </el-col>
           </el-row>
@@ -47,104 +65,256 @@
       <div class="mymain-container">
         <div class="btn-group clearfix">
           <div class="fl">
-            <el-button size="mini" type="primary" icon="el-icon-plus" @click="toForm()" v-if="$checkBtnRole('add', $route.meta.roles)">新增</el-button>
+            <el-button
+              size="mini"
+              type="primary"
+              icon="el-icon-plus"
+              @click="toForm()"
+              v-if="$checkBtnRole('add', $route.meta.roles)"
+              >新增</el-button
+            >
           </div>
           <div class="fr">
             <ExportButton :exUrl="'pick/export'" :exParams="exParams" />
           </div>
         </div>
         <div class="table">
-          <el-table v-loading="listLoading" :data="dataList" element-loading-text="Loading" border fit highlight-current-row stripe>
-            <el-table-column align="left" label="状态" min-width="80" show-overflow-tooltip>
+          <el-table
+            v-loading="listLoading"
+            :data="dataList"
+            element-loading-text="Loading"
+            border
+            fit
+            highlight-current-row
+            stripe
+          >
+            <el-table-column
+              align="left"
+              label="状态"
+              min-width="80"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
-                {{ scope.row.printNum ? '已打单':'未打单' }}
+                {{ scope.row.printNum ? "已打单" : "未打单" }}
               </template>
             </el-table-column>
-            <el-table-column align="left" label="打单日期" prop="printTime" min-width="160" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="信息密钥" prop="informationKey" min-width="100" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="打单日期"
+              prop="printTime"
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="left"
+              label="信息密钥"
+              prop="informationKey"
+              min-width="100"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.informationKey" />
-                <span>{{scope.row.informationKey}}</span>
+                <span>{{ scope.row.informationKey }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="物料编码" prop="materialCode" min-width="120" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="物料编码"
+              prop="materialCode"
+              min-width="120"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.materialCode" />
-                <span>{{scope.row.materialCode}}</span>
+                <span>{{ scope.row.materialCode }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="产品编码" prop="materialOldNumber" min-width="140" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="产品编码"
+              prop="materialOldNumber"
+              min-width="140"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.materialOldNumber" />
-                <span>{{scope.row.materialOldNumber}}</span>
+                <span>{{ scope.row.materialOldNumber }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="产品名称"
+              prop="materialName"
+              min-width="160"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.materialName" />
-                <span>{{scope.row.materialName}}</span>
+                <span>{{ scope.row.materialName }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="规格型号" prop="specification" min-width="350" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="规格型号"
+              prop="specification"
+              min-width="350"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.specification" />
-                <span>{{scope.row.specification}}</span>
+                <span>{{ scope.row.specification }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="提货总数量" prop="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="发货申请单号" prop="invoiceId" min-width="120" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="提货总数量"
+              prop="refundableQty"
+              min-width="100"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="left"
+              label="发货申请单号"
+              prop="invoiceId"
+              min-width="120"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.invoiceId" />
-                <span>{{scope.row.invoiceId}}</span>
+                <span>{{ scope.row.invoiceId }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="销售订单号" prop="mainOrderId" min-width="140" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="销售订单号"
+              prop="mainOrderId"
+              min-width="140"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
-                <CopyButton :copyText="(scope.row.orderType == 'HOME' || scope.row.orderType == 'TRADE') ? scope.row.enginOrderNo: scope.row.mainOrderId" />
-                <span>{{ (scope.row.orderType == 'HOME' || scope.row.orderType == 'TRADE') ? scope.row.enginOrderNo: scope.row.mainOrderId }}</span>
+                <CopyButton :copyText='scope.row.orderType === "TRADE" ||
+                scope.row.orderType === "HOME" || scope.row.orderType
+                ==="REQUISITION_TRADE" || scope.row.orderType
+                ==="REQUISITION_HOME"? scope.row.enginOrderNo:scope.row.mainOrderId' />
+                <span>{{
+                  scope.row.orderType === "TRADE" ||
+                  scope.row.orderType === "HOME" ||
+                  scope.row.orderType === "REQUISITION_TRADE" ||
+                  scope.row.orderType === "REQUISITION_HOME"
+                    ? scope.row.enginOrderNo
+                    : scope.row.mainOrderId
+                }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="销售类型" prop="saleTypeName" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column
+              align="left"
+              label="销售类型"
+              prop="saleTypeName"
+              min-width="100"
+              show-overflow-tooltip
+            ></el-table-column>
 
-            <el-table-column align="left" label="工程订单号" prop="enginOrderNo" min-width="140" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="工程订单号"
+              prop="enginOrderNo"
+              min-width="140"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.enginOrderNo" />
-                <span>{{scope.row.enginOrderNo}}</span>
+                <span>{{ scope.row.enginOrderNo }}</span>
               </template>
             </el-table-column>
 
-            <el-table-column align="left" label="预约日期" prop="pickTime" min-width="100" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="预约日期"
+              prop="pickTime"
+              min-width="100"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 {{ scope.row.pickTime | dateToDayFilter }}
               </template>
             </el-table-column>
-            <el-table-column align="left" label="提货时段" min-width="100" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="提货时段"
+              min-width="100"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
-                {{ scope.row.pickStatus == '1' ? '上午':'下午' }}
+                {{ scope.row.pickStatus == "1" ? "上午" : "下午" }}
               </template>
             </el-table-column>
-            <el-table-column align="left" label="提货仓库" prop="correspondName" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="提货方式" prop="pickType" min-width="100" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="提货仓库"
+              prop="correspondName"
+              min-width="100"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="left"
+              label="提货方式"
+              prop="pickType"
+              min-width="100"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
-                {{ scope.row.pickType == '1' ? '自提':'物流快递' }}
+                {{ scope.row.pickType == "1" ? "自提" : "物流快递" }}
               </template>
             </el-table-column>
-            <el-table-column align="left" label="单据日期" prop="theTime" min-width="120" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="单据日期"
+              prop="theTime"
+              min-width="120"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 {{ scope.row.theTime | dateToDayFilter }}
               </template>
             </el-table-column>
 
-            <el-table-column align="left" label="备注" prop="remark" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="center" label="操作" width="100" fixed="right">
+            <el-table-column
+              align="left"
+              label="备注"
+              prop="remark"
+              min-width="100"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="操作"
+              width="100"
+              fixed="right"
+            >
               <template slot-scope="scope">
-                <el-button type="text" @click="toForm(scope.row)" v-if="$checkBtnRole('edit', $route.meta.roles) && !scope.row.printNum">编辑</el-button>
+                <el-button
+                  type="text"
+                  @click="toForm(scope.row)"
+                  v-if="
+                    $checkBtnRole('edit', $route.meta.roles) &&
+                    !scope.row.printNum
+                  "
+                  >编辑</el-button
+                >
                 <el-popconfirm
-                  style="margin-left: 10px;"
-                  :title="'确定' + (scope.row.printNum ? '作废' : '取消') +'吗?'"
+                  style="margin-left: 10px"
+                  :title="
+                    '确定' + (scope.row.printNum ? '作废' : '取消') + '吗?'
+                  "
                   @onConfirm="handleCancel(scope.row.id)"
-                  v-if="$checkBtnRole('cancel', $route.meta.roles) && ((isDealer && !scope.row.printNum) || !isDealer)" >
-                  <el-button slot="reference" type="text">{{scope.row.printNum ? '作废' : '取消'}}</el-button>
+                  v-if="
+                    $checkBtnRole('cancel', $route.meta.roles) &&
+                    ((isDealer && !scope.row.printNum) || !isDealer)
+                  "
+                >
+                  <el-button slot="reference" type="text">{{
+                    scope.row.printNum ? "作废" : "取消"
+                  }}</el-button>
                 </el-popconfirm>
               </template>
             </el-table-column>
@@ -160,14 +330,18 @@
             :page-sizes="[10, 20, 30, 50]"
             :page-size="10"
             layout="total, sizes, prev, pager, next, jumper"
-            :total="listTotal">
+            :total="listTotal"
+          >
           </el-pagination>
         </div>
       </div>
     </div>
 
-    <PickupForm :listItem="queryItem" v-if="isShowForm" @backListFormDetail="backList" />
-
+    <PickupForm
+      :listItem="queryItem"
+      v-if="isShowForm"
+      @backListFormDetail="backList"
+    />
   </div>
 </template>
 
@@ -177,7 +351,7 @@ import PickupForm from "@/views/supply/pickup/components/pickup_form";
 
 export default {
   components: {
-    PickupForm
+    PickupForm,
   },
   data() {
     return {
@@ -186,31 +360,31 @@ export default {
       listTotal: 0, // 列表总数
       dataList: null, // 列表数据
       listLoading: false, // 列表加载loading
-      screenForm: { // 筛选表单数据
-        orderNum: '',
-        applyName: '',
-        warehouse: '',
-        date: '',
+      screenForm: {
+        // 筛选表单数据
+        orderNum: "",
+        applyName: "",
+        warehouse: "",
+        date: "",
       },
 
       queryItem: {},
       isShowForm: false,
-
-    }
+    };
   },
 
   computed: {
     isDealer() {
-      return JSON.parse(localStorage.getItem("supply_user")).isCustomer
+      return JSON.parse(localStorage.getItem("supply_user")).isCustomer;
     },
     exParams() {
       return {
         invoiceId: this.screenForm.orderNum,
         createBy: this.screenForm.applyName,
         stockName: this.screenForm.warehouse,
-        pickStartTime: this.screenForm.date ? this.screenForm.date[0] : '',
-        pickEndTime: this.screenForm.date ? this.screenForm.date[1] : '',
-      }
+        pickStartTime: this.screenForm.date ? this.screenForm.date[0] : "",
+        pickEndTime: this.screenForm.date ? this.screenForm.date[1] : "",
+      };
     },
   },
 
@@ -225,7 +399,7 @@ export default {
       // if(!btnRole) {return true}
       // let index = btnRole.indexOf(value);
       // return index >= 0;
-      return true
+      return true;
     },
 
     // 查询列表
@@ -238,14 +412,14 @@ export default {
         invoiceId: this.screenForm.orderNum,
         createBy: this.screenForm.applyName,
         stockName: this.screenForm.warehouse,
-        pickStartTime: this.screenForm.date ? this.screenForm.date[0] : '',
-        pickEndTime: this.screenForm.date ? this.screenForm.date[1] : '',
+        pickStartTime: this.screenForm.date ? this.screenForm.date[0] : "",
+        pickEndTime: this.screenForm.date ? this.screenForm.date[1] : "",
       };
       getPickupList(params).then((res) => {
         this.dataList = res.data.records;
         this.listTotal = res.data.total;
         this.listLoading = false;
-      })
+      });
     },
 
     // 提交筛选表单
@@ -287,15 +461,13 @@ export default {
 
     // 取消/作废
     handleCancel(id) {
-      cancelData({id}).then(res => {
+      cancelData({ id }).then((res) => {
         this.$successMsg();
         this.getList();
-      })
+      });
     },
-  }
-}
+  },
+};
 </script>
 
-<style lang="scss" scoped>
-
-</style>
+<style lang="scss" scoped></style>

+ 24 - 30
src/views/supply/sales/sales_list.vue

@@ -130,17 +130,10 @@
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="打印时间排序" prop="printDesc">
-                  <el-select v-model="screenForm.printDesc"  clearable filterable >
-                    <el-option
-                      label="默认"
-                      :value="null">
-                    </el-option>
-                    <el-option
-                      label="倒叙"
-                      :value="1">
-                    </el-option>
-                  </el-select>
-
+                <el-select v-model="screenForm.printDesc" clearable filterable>
+                  <el-option label="默认" :value="null"> </el-option>
+                  <el-option label="倒叙" :value="1"> </el-option>
+                </el-select>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
@@ -199,7 +192,10 @@
             >
           </div>
           <div class="fr">
-            <ExportButton :exUrl="'sale/order/exportChuku'" :exParams="exParams" />
+            <ExportButton
+              :exUrl="'sale/order/exportChuku'"
+              :exParams="exParams"
+            />
           </div>
         </div>
         <div class="table">
@@ -292,16 +288,14 @@
               show-overflow-tooltip
             >
               <template slot-scope="scope">
-                <CopyButton
-                  :copyText="
-                    scope.row.orderType === 'TRADE'
-                      ? scope.row.enginOrderNo
-                      : scope.row.mainOrderId
-                  "
-                />
-                <span>{{
+                <CopyButton :copyText='scope.row.orderType === "TRADE" ||
+                scope.row.orderType === "HOME" || scope.row.orderType
+                ==="REQUISITION_TRADE" || scope.row.orderType
+                ==="REQUISITION_HOME"? scope.row.enginOrderNo:scope.row.mainOrderId' />                <span>{{
                   scope.row.orderType === "TRADE" ||
-                  scope.row.orderType === "HOME"
+                  scope.row.orderType === "HOME" ||
+                  scope.row.orderType === "REQUISITION_TRADE" ||
+                  scope.row.orderType === "REQUISITION_HOME"
                     ? scope.row.enginOrderNo
                     : scope.row.mainOrderId
                 }}</span>
@@ -566,8 +560,8 @@ export default {
         status: "",
         mainOrderId: "",
         approval: "",
-        printTime:'',
-        printDesc:null,
+        printTime: "",
+        printDesc: null,
         id: "",
       },
       statusList: [
@@ -644,14 +638,14 @@ export default {
         approvalEndTime: this.screenForm.approval
           ? this.screenForm.approval[1]
           : "",
-          printStartTime:this.screenForm.printTime
+        printStartTime: this.screenForm.printTime
           ? this.screenForm.printTime[0]
           : "",
-          printEndtTime:this.screenForm.printTime
+        printEndtTime: this.screenForm.printTime
           ? this.screenForm.printTime[1]
           : "",
         mainOrderId: this.screenForm.mainOrderId,
-        printTimeDesc:this.screenForm.printDesc,
+        printTimeDesc: this.screenForm.printDesc,
         id: this.screenForm.id.replace(/,/gi, ","),
       };
     },
@@ -702,13 +696,13 @@ export default {
           ? this.screenForm.approval[1]
           : "",
         mainOrderId: this.screenForm.mainOrderId,
-          printStartTime:this.screenForm.printTime
+        printStartTime: this.screenForm.printTime
           ? this.screenForm.printTime[0]
           : "",
-          printEndtTime:this.screenForm.printTime
+        printEndtTime: this.screenForm.printTime
           ? this.screenForm.printTime[1]
           : "",
-          printTimeDesc:this.screenForm.printDesc,
+        printTimeDesc: this.screenForm.printDesc,
         id: this.screenForm.id.replace(/,/gi, ","),
       };
       getList(params).then((res) => {
@@ -757,7 +751,7 @@ export default {
           if (res.data) {
             this.$confirm(res.data, "提示", {
               confirmButtonText: "确定",
-              showCancelButton:false
+              showCancelButton: false,
             });
           }
         });