Qukatie před 8 měsíci
rodič
revize
432e5ce788
2 změnil soubory, kde provedl 101 přidání a 207 odebrání
  1. 5 5
      src/views/morePage/stock/index.vue
  2. 96 202
      src/views/purchaseIssue/index.vue

+ 5 - 5
src/views/morePage/stock/index.vue

@@ -160,9 +160,6 @@
     </el-form>
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button size="mini" @click="handleQuery()">全部</el-button></el-col
-      >
-      <el-col :span="1.5">
         <el-button size="mini" @click="handleQuery('S')">待审业务</el-button></el-col
       >
       <el-col :span="1.5">
@@ -171,7 +168,9 @@
       <el-col :span="1.5">
         <el-button size="mini" @click="handleQuery('A')" index="A">审核通过</el-button></el-col
       >
-
+      <el-col :span="1.5">
+        <el-button size="mini" @click="handleQuery()">全部</el-button></el-col
+      >
       <div class="tabSetting">
         <div style="margin-right: 20px">
           <el-button
@@ -415,6 +414,7 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
+        auditStatus:'S',
         refno1: null,
         rbillId: null,
         billNo: null,
@@ -631,7 +631,7 @@ export default {
         auditOpTimeList:null,
       }
       this.resetForm("queryForm");
-      this.handleQuery();
+      this.handleQuery('S');
     },
     getList() {
       this.loading = true;

+ 96 - 202
src/views/purchaseIssue/index.vue

@@ -1,33 +1,12 @@
 <template>
   <div>
     <div v-if="pageDisplay" class="app-container">
-      <formComponent
-        v-if="searchWhether"
-        :formOption="formOption"
-        :dataList="dataList"
-        :inDex="inDex"
-        ref="avatar"
-        @submitForm="submitForm"
-        @returnToForm="returnToForm"
-      />
-      <listComponent
-        :tableData="tableData"
-        @selectionbox="selectionbox"
-        @see="viewMethod"
-        @modify="modification"
-        @deletion="deletion"
-        @buttonList="buttonList"
-        @showSearch="showSearch"
-        @feedback="feedback"
-        @getList="getList"
-        :hasPermi="hasPermi"
-        :isItHidden="isItHidden"
-        :customButton="customButton"
-        :listStyle="listStyle"
-        :queryList="queryList"
-        :setRowList="setRowList"
-        :tatolLabel="tatolLabel"
-      />
+      <formComponent v-if="searchWhether" :formOption="formOption" :dataList="dataList" :inDex="inDex" ref="avatar"
+        @submitForm="submitForm" @returnToForm="returnToForm" />
+      <listComponent :tableData="tableData" @selectionbox="selectionbox" @see="viewMethod" @modify="modification"
+        @deletion="deletion" @buttonList="buttonList" @showSearch="showSearch" @feedback="feedback" @getList="getList"
+        :hasPermi="hasPermi" :isItHidden="isItHidden" :customButton="customButton" :listStyle="listStyle"
+        :queryList="queryList" :setRowList="setRowList" :tatolLabel="tatolLabel" />
       <!--      <el-pagination-->
       <!--        style="float: right;margin-top: 10px"-->
       <!--        @size-change="handleSizeChange"-->
@@ -40,88 +19,36 @@
       <!--      >-->
       <!--      </el-pagination>-->
       <div style="float: right; margin-bottom: 10px">
-        <pagination
-          v-show="total > 0"
-          :total="total"
-          :page.sync="formDataList.pageNum"
-          :limit.sync="formDataList.pageSize"
-          @pagination="feedback('搜索')"
-          :page-sizes="[10, 100, 200, 500, 1000]"
-        />
+        <pagination v-show="total > 0" :total="total" :page.sync="formDataList.pageNum"
+          :limit.sync="formDataList.pageSize" @pagination="feedback('搜索')" :page-sizes="[10, 100, 200, 500, 1000]" />
       </div>
     </div>
     <div v-else class="app-container">
       <div style="display: flex; margin-bottom: 10px">
         <el-breadcrumb>
           <el-breadcrumb-item style="margin-top: -7px">
-            <el-button
-              style="margin-left: 10px"
-              size="mini"
-              type="danger"
-              plain
-              @click="backToList"
-              icon="el-icon-arrow-left"
-            >
+            <el-button style="margin-left: 10px" size="mini" type="danger" plain @click="backToList"
+              icon="el-icon-arrow-left">
               返回列表
             </el-button>
           </el-breadcrumb-item>
         </el-breadcrumb>
       </div>
       <h1 style="text-align: center; margin-top: -42px">销售出库单</h1>
-      <formComponent
-        v-if="searchWhether"
-        :formOption="contentOption"
-        :dataList="dataList"
-        :inDex="inDex"
-        ref="avatar"
-        @writeOff="writeOff"
-        @submitForm="submitForm"
-        @returnToForm="returnToForm"
-        @submitAndSave="submitAndSave"
-        @selectTrigger="selectTrigger"
-      />
-      <listComponent
-        ref="listComponent"
-        :tableData="contentList"
-        @selectionbox="selectionbox"
-        @see="viewMethod"
-        @modify="modification"
-        @deletion="deletion"
-        @buttonList="buttonList"
-        @showSearch="showSearch"
-        @feedback="feedback"
-        @getList="getList"
-        @deletRows="deletRows"
-        @totalAmount="totalAmount"
-        @change="change"
-        :tatolLabel="tatolLabel"
-        :isItHidden="isItHidden"
-        :hasPermi="hasPermi"
-        :customButton="contentButton"
-        :listStyle="contentStyle"
-        :queryList="purchaseList"
-        :setRowList="setRowList"
-        :listData="listData"
-      />
+      <formComponent v-if="searchWhether" :formOption="contentOption" :dataList="dataList" :inDex="inDex" ref="avatar"
+        @writeOff="writeOff" @submitForm="submitForm" @returnToForm="returnToForm" @submitAndSave="submitAndSave"
+        @selectTrigger="selectTrigger" />
+      <listComponent ref="listComponent" :tableData="contentList" @selectionbox="selectionbox" @see="viewMethod"
+        @modify="modification" @deletion="deletion" @buttonList="buttonList" @showSearch="showSearch"
+        @feedback="feedback" @getList="getList" @deletRows="deletRows" @totalAmount="totalAmount" @change="change"
+        :tatolLabel="tatolLabel" :isItHidden="isItHidden" :hasPermi="hasPermi" :customButton="contentButton"
+        :listStyle="contentStyle" :queryList="purchaseList" :setRowList="setRowList" :listData="listData" />
     </div>
-    <add-or-update
-      v-if="addOrUpdateVisible"
-      ref="addOrUpdate"
-      @refreshDataList="getDataList"
-    ></add-or-update>
-    <approval-comments
-      v-if="addOrUpdateVisib"
-      ref="ApprovalComments"
-      @refreshDataList="returnData"
-    ></approval-comments>
+    <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+    <approval-comments v-if="addOrUpdateVisib" ref="ApprovalComments" @refreshDataList="returnData"></approval-comments>
     <div class="print_div">
-      <el-dialog
-        :title="`打印${reverse}`"
-        :visible.sync="dialogVisible"
-        :fullscreen="true"
-        width="70%"
-        style="background-color: #1c84c6;padding: 0;margin:0;"
-      >
+      <el-dialog :title="`打印${reverse}`" :visible.sync="dialogVisible" :fullscreen="true" width="70%"
+        style="background-color: #1c84c6;padding: 0;margin:0;">
         <div style="margin-bottom: 5px">
           标题切换:
           <el-radio-group v-model="reverse">
@@ -135,30 +62,26 @@
             <h1 style="text-align: center; font-weight: bold">
               {{ formList.fsbuName }}-{{ reverse }}
             </h1>
-            <div
-              style="
+            <div style="
                 display: flex;
                 justify-content: space-between;
                 margin-bottom: 10px;
-              "
-            >
+              ">
               <div style="width: 250px; height: 20px; font-size: 14px">
                 客户项目:{{ projectName }}
               </div>
-<!--              <div style="width: 200px; height: 20px; font-size: 14px">-->
-<!--                销售出库单-->
-<!--              </div>-->
+              <!--              <div style="width: 200px; height: 20px; font-size: 14px">-->
+              <!--                销售出库单-->
+              <!--              </div>-->
               <div style="width: 250px; height: 20px; font-size: 14px">
                 出库日期:{{ formList.fBsdate }}
               </div>
             </div>
-            <div
-              style="
+            <div style="
                 display: flex;
                 justify-content: space-between;
                 margin-bottom: 10px;
-              "
-            >
+              ">
               <div style="width: 250px; height: 20px; font-size: 14px">
                 公司电话:{{ formList.fsbuTel }}
               </div>
@@ -176,13 +99,11 @@
             <h1 style="text-align: center; font-weight: bold">
               {{ formList.fsbuName }}-{{ reverse }}
             </h1>
-            <div
-              style="
+            <div style="
                 display: flex;
                 justify-content: space-between;
                 margin-bottom: 10px;
-              "
-            >
+              ">
               <div style="width: 250px; height: 20px; font-size: 14px">
                 客户项目:{{ projectName }}
               </div>
@@ -191,13 +112,11 @@
                 出库日期:{{ formList.fBsdate }}
               </div>
             </div>
-            <div
-              style="
+            <div style="
                 display: flex;
                 justify-content: space-between;
                 margin-bottom: 10px;
-              "
-            >
+              ">
               <div style="width: 250px; height: 20px; font-size: 14px">
                 公司电话:{{ formList.fsbuTel }}
               </div>
@@ -215,30 +134,26 @@
             <h1 style="text-align: center; font-weight: bold">
               {{ formList.fsbuName }}-{{ reverse }}
             </h1>
-            <div
-              style="
+            <div style="
                 display: flex;
                 justify-content: space-between;
                 margin-bottom: 10px;
-              "
-            >
+              ">
               <div style="width: 250px; height: 20px; font-size: 14px">
                 公司电话:{{ formList.fsbuTel }}
               </div>
-<!--              <div style="width: 200px; height: 20px; font-size: 14px">-->
-<!--                销售单-->
-<!--              </div>-->
+              <!--              <div style="width: 200px; height: 20px; font-size: 14px">-->
+              <!--                销售单-->
+              <!--              </div>-->
               <div style="width: 250px; height: 20px; font-size: 14px">
                 出库日期:{{ formList.fBsdate }}
               </div>
             </div>
-            <div
-              style="
+            <div style="
                 display: flex;
                 justify-content: space-between;
                 margin-bottom: 10px;
-              "
-            >
+              ">
               <div style="width: 250px; height: 20px; font-size: 14px">
                 客户项目:{{ projectName }}
               </div>
@@ -256,13 +171,11 @@
             <h1 style="text-align: center; font-weight: bold">
               {{ formList.fsbuName }}-{{ reverse }}
             </h1>
-            <div
-              style="
+            <div style="
                 display: flex;
                 justify-content: space-between;
                 margin-bottom: 10px;
-              "
-            >
+              ">
               <div style="width: 250px; height: 20px; font-size: 14px">
                 编号:{{ formList.corpsNo
                 }}{{
@@ -276,13 +189,11 @@
                 公司电话:{{ formList.fsbuTel }}
               </div>
             </div>
-            <div
-              style="
+            <div style="
                 display: flex;
                 justify-content: space-between;
                 margin-bottom: 10px;
-              "
-            >
+              ">
               <div style="width: 250px; height: 20px; font-size: 14px">
                 出库日期:{{ formList.fBsdate }}
               </div>
@@ -293,16 +204,14 @@
           </div>
           <div v-else-if="formList.fsbuName === '青岛盛元嘉蔬菜配送有限公司'">
             <h1 style="text-align: center; font-weight: bold">
-<!--              销售出库-{{ formList.fsbuName }}-->
+              <!--              销售出库-{{ formList.fsbuName }}-->
               {{ formList.fsbuName }}-{{ reverse }}
             </h1>
-            <div
-              style="
+            <div style="
                 display: flex;
                 justify-content: space-between;
                 margin-bottom: 10px;
-              "
-            >
+              ">
               <div style="width: 250px; height: 20px; font-size: 14px">
                 客户项目:{{ projectName }}
               </div>
@@ -316,13 +225,11 @@
                 }}
               </div>
             </div>
-            <div
-              style="
+            <div style="
                 display: flex;
                 justify-content: space-between;
                 margin-bottom: 10px;
-              "
-            >
+              ">
               <div style="width: 250px; height: 20px; font-size: 14px">
                 出库日期:{{ formList.fBsdate }}
               </div>
@@ -333,16 +240,14 @@
           </div>
           <div v-else-if="formList.fsbuName === '青岛优利安肉食有限公司'">
             <h1 style="text-align: center; font-weight: bold">
-<!--              销售单 {{ formList.fsbuName }}-->
+              <!--              销售单 {{ formList.fsbuName }}-->
               {{ formList.fsbuName }}-{{ reverse }}
             </h1>
-            <div
-              style="
+            <div style="
                 display: flex;
                 justify-content: space-between;
                 margin-bottom: 10px;
-              "
-            >
+              ">
               <div style="width: 250px; height: 20px; font-size: 14px">
                 编号:{{ formList.corpsNo
                 }}{{
@@ -356,13 +261,11 @@
                 客户项目:{{ projectName }}
               </div>
             </div>
-            <div
-              style="
+            <div style="
                 display: flex;
                 justify-content: space-between;
                 margin-bottom: 10px;
-              "
-            >
+              ">
               <div style="width: 250px; height: 20px; font-size: 14px">
                 出库日期:{{ formList.fBsdate }}
               </div>
@@ -375,30 +278,26 @@
             <h1 style="text-align: center; font-weight: bold">
               {{ formList.fsbuName }}-{{ reverse }}
             </h1>
-            <div
-              style="
+            <div style="
                 display: flex;
                 justify-content: space-between;
                 margin-bottom: 10px;
-              "
-            >
+              ">
               <div style="width: 250px; height: 20px; font-size: 14px">
                 客户项目:{{ projectName }}
               </div>
-<!--              <div style="width: 200px; height: 20px; font-size: 14px">-->
-<!--                销售{{ reverse }}-->
-<!--              </div>-->
+              <!--              <div style="width: 200px; height: 20px; font-size: 14px">-->
+              <!--                销售{{ reverse }}-->
+              <!--              </div>-->
               <div style="width: 250px; height: 20px; font-size: 14px">
                 出库日期:{{ formList.fBsdate }}
               </div>
             </div>
-            <div
-              style="
+            <div style="
                 display: flex;
                 justify-content: space-between;
                 margin-bottom: 10px;
-              "
-            >
+              ">
               <div style="width: 250px; height: 20px; font-size: 14px">
                 公司电话:{{ formList.fsbuTel }}
               </div>
@@ -413,11 +312,7 @@
             </div>
           </div>
 
-          <table
-            class="table table-striped table-bordered"
-            align="center"
-            valign="center"
-          >
+          <table class="table table-striped table-bordered" align="center" valign="center">
             <tr>
               <td class="column" style="width: 8%">行号</td>
               <td class="column" style="width: 20%">物料名称</td>
@@ -457,34 +352,18 @@
             <!--            <td class="column" colspan="3">{{formList.fMoney}}</td>-->
             <!--          </tr>-->
           </table>
-          <table
-            class="table table-striped table-bordered"
-            align="center"
-            valign="center"
-          >
+          <table class="table table-striped table-bordered" align="center" valign="center">
             <tr>
-              <td
-                class="column"
-                colspan="2"
-                style="border-top: none; width: 15%"
-              >
+              <td class="column" colspan="2" style="border-top: none; width: 15%">
                 大写总金额:
               </td>
-              <td
-                class="column"
-                colspan="2"
-                style="text-align: left; border-top: none; width: 40%"
-              >
+              <td class="column" colspan="2" style="text-align: left; border-top: none; width: 40%">
                 {{ chineseStr }}
               </td>
               <td class="column" style="border-top: none; width: 15%">
                 小写总金额:
               </td>
-              <td
-                class="column"
-                colspan="3"
-                style="border-top: none; text-align: left; width: 30%"
-              >
+              <td class="column" colspan="3" style="border-top: none; text-align: left; width: 30%">
                 {{
                   formList.fMoney
                     ? parseFloat(formList.fMoney).toFixed(2)
@@ -493,13 +372,11 @@
               </td>
             </tr>
           </table>
-          <div
-            style="
+          <div style="
               display: flex;
               justify-content: space-between;
               margin-top: 20px;
-            "
-          >
+            ">
             <div style="width: 200px; height: 20px; font-size: 14px">
               发货人:{{ formList.manage }}
             </div>
@@ -1193,9 +1070,9 @@ export default {
       y + " 23:59:59",
     ]);
     this.query(this.formDataList);
-    this.dataList.isKp.push({label: '全部', value: 0})
-    this.dataList.isKp.push({label: '否', value: 1})
-    this.dataList.isKp.push({label: '是', value: 2})
+    this.dataList.isKp.push({ label: '全部', value: 0 })
+    this.dataList.isKp.push({ label: '否', value: 1 })
+    this.dataList.isKp.push({ label: '是', value: 2 })
     productName().then((res) => {
       if (res.code === 200) {
         for (let item in res.rows) {
@@ -1707,7 +1584,7 @@ export default {
       this.contentButton.forEach((item) => (item.disabled = false));
       this.contentStyle.forEach((item) => (item.disabled = false));
     },
-    returnToForm(row) {},
+    returnToForm(row) { },
     //查看
     viewMethod(scope, res, i) {
       console.log(res);
@@ -1736,6 +1613,12 @@ export default {
         this.contentOption.forEach((item) => (item.disabled = true));
         this.contentStyle.forEach((item) => (item.disabled = true));
       }
+      const loading = this.$loading({
+        lock: true,
+        text: '加载中',
+        spinner: 'el-icon-loading',
+        background: 'rgba(255,255,255,0.7)'
+      });
       viewSingle(scope.row.fId).then((res) => {
         console.log(res);
         if (res.code === 200) {
@@ -1749,7 +1632,9 @@ export default {
           };
           this.getRow(data, list, "", i);
         }
-      });
+      }).finally(() => {
+        loading.close();
+      })
     },
     //请核
     writeOff() {
@@ -1777,7 +1662,7 @@ export default {
       });
     },
     //修改
-    modification(scope) {},
+    modification(scope) { },
     //删除
     deletion(scope) {
       tableDeleteQuery(scope.row.fId).then((res) => {
@@ -1785,7 +1670,7 @@ export default {
           res.msg == 1
             ? "主表数据为空"
             : (res.msg == 2 ? "主表有数据" : "未知状态") +
-                "是否永久删除该条数据?",
+            "是否永久删除该条数据?",
           "提示",
           {
             confirmButtonText: "确定",
@@ -1885,6 +1770,12 @@ export default {
           this.contentButton.forEach((item) => (item.disabled = false));
           this.contentStyle.forEach((item) => (item.disabled = false));
         } else {
+          const loading = this.$loading({
+            lock: true,
+            text: '加载中',
+            spinner: 'el-icon-loading',
+            background: 'rgba(255,255,255,0.7)'
+          });
           submit(formData).then((res) => {
             if (res.code == 200) {
               if (res) {
@@ -1892,6 +1783,7 @@ export default {
               }
               this.contentList = res.data.tWarehousebillsCntrs;
               this.$message.success("保存成功");
+
               viewSingle(this.$refs.avatar.form.fId).then((res) => {
                 if (res.code === 200) {
                   let list = {
@@ -1903,9 +1795,11 @@ export default {
                   this.toChies(this.$refs.avatar.form.fMoney);
                   // this.dialogVisible = true
                 }
-              });
+              })
             }
-          });
+          }).finally(() => {
+            loading.close();
+          })
         }
       }
       if (item == 1) {
@@ -1979,7 +1873,7 @@ export default {
       let list = {
         fId: this.$refs.avatar.form.fId,
       };
-      printingTiem(list).then((res) => {});
+      printingTiem(list).then((res) => { });
     },
     //返回列表
     backToList() {
@@ -2402,7 +2296,7 @@ export default {
   border: 1px solid #000;
 }
 
-.app-container >>> .el-form-item {
+.app-container>>>.el-form-item {
   margin-bottom: 0;
 }