福达

src/views/exportTrade/purchaseContract/detailsPage.vue

@@ -186,7 +186,7 @@
               >排产中</el-button>
               <el-button :type="form.estimateGoodGoods?'info':'success'" size="small" :disabled="!form.id" @click.native="dialog = true;fudaSatus = 2"
               >预计货好</el-button>
-              <el-button type="info" size="small" :disabled="!form.id || form.fudaPurchaseStatus != '采购中'" @click.native="dialog = true;fudaSatus = 3"
+              <el-button type="success" size="small" :disabled="!form.id || !form.estimateGoodGoods" @click.native="dialog = true;fudaSatus = 3"
               >货备齐</el-button>
 <!--              <el-button-->
 <!--                type="warning"-->

src/views/exportTrade/purchaseContract/index.vue

@@ -231,7 +231,7 @@
         </el-row>
       </span>
       <span slot="footer" class="dialog-footer">
-          <el-button type="info" size="small">导出</el-button>
+          <el-button type="warning" @click="outExport">导出</el-button>
         <el-button @click="dialogVisible = false;params={}">取 消</el-button>
         <el-button type="primary" :disabled="goodsListSave.length === 0" @click="confirmImport">导 入</el-button>
       </span>
@@ -253,6 +253,7 @@ import detailPage from "./detailsPage.vue";
 import {defaultDate} from "@/util/date";
 import {IntegerFormat} from "@/util/validate";
 import {customerParameter} from "@/enums/management-type";
+import {getToken} from "@/util/auth";
 
 export default {
     name: "customerInformation",
@@ -428,6 +429,30 @@ export default {
     }
     },
   methods: {
+      outExport() {
+          let config = {params: {...this.params}}
+          if (config.params) {
+              for (const propName of Object.keys(config.params)) {
+                  const value = config.params[propName];
+                  if (value !== null && typeof (value) !== "undefined") {
+                      if (value instanceof Array) {
+                          for (const key of Object.keys(value)) {
+                              let params = propName + '[' + key + ']';
+                              config.params[params] = value[key]
+                          }
+                          delete config.params[propName]
+                      }
+                  }
+              }
+          }
+          const routeData = this.$router.resolve({
+              path: '/api/blade-purchase-sales/exportOrder/listXSExport',      //跳转目标窗口的地址
+              query: {
+                  ...config.params    //括号内是要传递给新窗口的参数
+              }
+          })
+          window.open(routeData.href.slice(1, routeData.href.length) + '&' + `${this.website.tokenHeader}=${getToken()}`);
+      },
       nodeClick(data) {
           this.params.pid = data.id
           this.dialogPage.currentPage = 1;

src/views/exportTrade/salesContract/detailsPage.vue

@@ -10,17 +10,17 @@
                 <el-button type="primary" size="small" v-if="detailData.status == 1" class="el-button--small-yh "
                            @click.stop="openEdit">编辑
                 </el-button>
-<!--                <el-dropdown style="margin-right: 8px;margin-left: 8px;">-->
-<!--                    <el-button type="primary" size="small">-->
-<!--                        审核处理<i class="el-icon-arrow-down el-icon&#45;&#45;right"></i>-->
-<!--                    </el-button>-->
-<!--                    <el-dropdown-menu slot="dropdown">-->
-<!--                        <el-dropdown-item :disabled="form.status > 0" @click.native="pleaseCheck">请核数据-->
-<!--                        </el-dropdown-item>-->
-<!--                        <el-dropdown-item disabled>审核进度</el-dropdown-item>-->
+                <el-dropdown style="margin-right: 8px;margin-left: 8px;">
+                    <el-button type="primary" size="small">
+                        审核处理<i class="el-icon-arrow-down el-icon--right"></i>
+                    </el-button>
+                    <el-dropdown-menu slot="dropdown">
+                        <el-dropdown-item :disabled="form.status > 0 || (!form.status && form.status !== 0)" @click.native="pleaseCheck">请核数据
+                        </el-dropdown-item>
+                        <el-dropdown-item @click.native="checkScheduleDialog = true,checkId = form.id">审核进度</el-dropdown-item>
 <!--                        <el-dropdown-item disabled>撤销请核</el-dropdown-item>-->
-<!--                    </el-dropdown-menu>-->
-<!--                </el-dropdown>-->
+                    </el-dropdown-menu>
+                </el-dropdown>
                 <el-dropdown style="margin-right: 8px;">
           <el-button type="warning" size="small">
             账单处理<i class="el-icon-arrow-down el-icon--right"></i>
@@ -454,6 +454,25 @@
     <part-dialog ref="part" :partList="partList" @importPart="importPart" @partClosed="partClosed" />
     <price-library ref="library" @importLibray="importLibray" />
     <property-dialog ref="property" @importProperty="importProperty" />
+
+        <el-dialog
+                append-to-body
+                title="审批进度"
+                class="el-dialogDeep"
+                :visible.sync="checkScheduleDialog"
+                width="40%"
+                v-if="checkScheduleDialog"
+                :close-on-click-modal="false"
+                :destroy-on-close="true"
+                :close-on-press-escape="false"
+                v-dialog-drag
+        >
+            <check-schedule
+                    :checkId="checkId"
+                    :batchNo="batchNo"
+                    @choceScheduleFun="choceScheduleFun"
+            ></check-schedule>
+        </el-dialog>
   </div>
 </template>
 
@@ -519,6 +538,7 @@ import {
   getCorpsattn
 } from "@/api/basicData/customerInformation";
 import goodsInfo from "./components/goodsInfo.vue";
+import checkSchedule from "@/components/check/checkSchedule.vue";
 export default {
   name: "detailsPageEdit",
   data() {
@@ -538,6 +558,9 @@ export default {
         dicData: []
       },
       switchDialog: false,
+        checkScheduleDialog: false,
+        checkId: '',
+        batchNo: '',
       form: {
         orderStatus: "录入",
         cargoType: "普货",
@@ -1093,6 +1116,7 @@ export default {
     }
   },
   components: {
+      checkSchedule,
     reportDialog,
     feeInfo,
     uploadFile,
@@ -1194,6 +1218,10 @@ export default {
     }
   },
   methods: {
+      //审核关闭
+      choceScheduleFun() {
+          this.checkScheduleDialog = false
+      },
     cellStyle() {
       return "padding:0;height:40px;";
     },