福达

src/styles/variables.scss

@@ -94,4 +94,4 @@ p{
 ::-webkit-scrollbar-thumb {
   border-radius: 6px !important;
   background-color: hsla(226, 12%, 71%, 0.25) !important;
-}
+}

src/views/exportTrade/purchaseContract/index.vue

@@ -141,22 +141,48 @@
         v-if="!show"
     ></detail-page>
     <el-dialog
-        title="导入销售单"
-        v-if="dialogVisible"
-        :visible.sync="dialogVisible"
-        append-to-body
-        :close-on-click-modal="false"
-        :close-on-press-escape="false"
-        :before-close="function() {
+            title="导入采购任务"
+            v-if="dialogVisible"
+            :visible.sync="dialogVisible"
+            append-to-body
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
+            :before-close="function() {
           dialogVisible = false;params={}
         }"
-        top="1vh"
-        width="90%">
+            top="1vh"
+            width="90%">
       <span>
         <el-row>
           <el-col :span="6" style="padding: 0 10px">
             <el-scrollbar>
-                <avue-tree :option="treeOption" :key="avueTree" :data="treeData" @node-click="nodeClick"/>
+<!--                <avue-tree :option="treeOption" :key="avueTree" :data="treeData" @node-click="nodeClick"/>-->
+                <!--                {{ treeData }}-->
+                <el-table
+                        style="width: 100%"
+                        border
+                        size="mini"
+                        ref="singleTable"
+                        highlight-current-row
+                        @current-change="handleCurrentChange"
+                        :data="treeData">
+                      <el-table-column
+                              prop="orderNo"
+                              show-overflow-tooltip
+                              align="center"
+                              label="销售单号">
+                      </el-table-column>
+                      <el-table-column
+                              prop="plannedDeliveryDate"
+                              show-overflow-tooltip
+                              width="105"
+                              align="center"
+                              label="交货日期">
+                          <template slot-scope="{row}">
+                              {{ row.plannedDeliveryDate ? row.plannedDeliveryDate.slice(0, 10) : '' }}
+                          </template>
+                      </el-table-column>
+                </el-table>
             </el-scrollbar>
           </el-col>
           <el-col :span="18">
@@ -214,20 +240,28 @@
 
 <script>
 import option from "./config/mainList.json";
-import {getList, remove, gainUser, listXS,generatePurchaseBill,listBYStatus} from "@/api/exportTrade/purchaseContract";
+import {
+    getList,
+    remove,
+    gainUser,
+    listXS,
+    generatePurchaseBill,
+    listBYStatus
+} from "@/api/exportTrade/purchaseContract";
 import detailPage from "./detailsPage.vue";
-import { defaultDate } from "@/util/date";
-import { IntegerFormat } from "@/util/validate";
+import {defaultDate} from "@/util/date";
+import {IntegerFormat} from "@/util/validate";
 import {customerParameter} from "@/enums/management-type";
+
 export default {
-  name: "customerInformation",
-  data() {
-    return {
-      search: {
-        businesDate: defaultDate()
-      },
-      treeData: [],
-      avueTree: false,
+    name: "customerInformation",
+    data() {
+        return {
+            search: {
+                businesDate: defaultDate()
+            },
+            treeData: [],
+            avueTree: false,
       treeOption: {
         nodeKey: "id",
         lazy: true,
@@ -246,26 +280,26 @@ export default {
         addBtn: false,
         menu: false,
         size: "small",
-        props: {
-          labelText: "标题",
-          label: "orderNo",
-          value: "id",
-          children: "children"
-        }
-      },
-      dialogData: [],
-      goodsListShow: [],
-      goodsListSave: [],
-      params:{},
-      dialogPage: {
-        pageSize: 20,
-        currentPage: 1,
-        total: 0,
-        pageSizes: [10, 20, 30, 40, 50, 100, 200, 300, 400, 500]
+          props: {
+              labelText: "标题",
+              label: "orderNo",
+              value: "id",
+              children: "children"
+          }
       },
-      activeName: 'searchList',
-      dialogOption: {},
-      dialogOptionList: {
+            dialogData: [],
+            goodsListShow: [],
+            goodsListSave: [],
+            params: {},
+            dialogPage: {
+                pageSize: 20,
+                currentPage: 1,
+                total: 0,
+                pageSizes: [10, 20, 30, 40, 50, 100, 200, 300, 400, 500]
+            },
+            activeName: 'searchList',
+            dialogOption: {},
+            dialogOptionList: {
         searchShow: true,
         searchMenuSpan: 16,
         border: true,
@@ -393,26 +427,26 @@ export default {
     }
     },
   methods: {
-    nodeClick(data) {
-      this.params.pid = data.id
-      this.dialogPage.currentPage = 1;
-      this.dialogOnLoad(this.dialogPage);
-    },
-    removeStagList(row, index) {
-      this.goodsListSave.splice(row.$index, 1);
-    },
-    searchCriteriaSwitch(type) {
-      if (type) {
-        this.option.height = this.option.height - 139;
-      } else {
-        this.option.height = this.option.height + 139;
-      }
-      this.$refs.crud.getTableHeight();
-    },
-    cellStyle() {
-      return "padding:0;height:40px;";
-    },
-    //删除列表后面的删除按钮触发触发(row, index, done)
+      nodeClick(data) {
+          this.params.pid = data.id
+          this.dialogPage.currentPage = 1;
+          this.dialogOnLoad(this.dialogPage);
+      },
+      removeStagList(row, index) {
+          this.goodsListSave.splice(row.$index, 1);
+      },
+      searchCriteriaSwitch(type) {
+          if (type) {
+              this.option.height = this.option.height - 139;
+          } else {
+              this.option.height = this.option.height + 139;
+          }
+          this.$refs.crud.getTableHeight();
+      },
+      cellStyle() {
+          return "padding:0;height:40px;";
+      },
+      //删除列表后面的删除按钮触发触发(row, index, done)
     rowDel(row, index, done) {
       this.$confirm("确定删除数据?", {
         confirmButtonText: "确定",
@@ -510,6 +544,7 @@ export default {
     },
     searchReset() {
       this.avueTree = !this.avueTree
+      this.$refs.singleTable.setCurrentRow([]);
       this.dialogData = []
     },
     //自定义列保存
@@ -620,36 +655,45 @@ export default {
         this.getColumnName(2),
         this.option
       );
-      if (inSave) {
-        this.$nextTick(() => {
-          this.$refs.crud.doLayout();
-        });
-        this.$message.success("保存成功");
-        //关闭窗口
-        this.$refs.crud.$refs.dialogColumn.columnBox = false;
-      }
+        if (inSave) {
+            this.$nextTick(() => {
+                this.$refs.crud.doLayout();
+            });
+            this.$message.success("保存成功");
+            //关闭窗口
+            this.$refs.crud.$refs.dialogColumn.columnBox = false;
+        }
     },
-    async resetColumn() {
-      this.option = option;
-      const inSave = await this.delColumnData(this.getColumnName(2), option);
-      if (inSave) {
-        this.$nextTick(() => {
-          this.$refs.crud.doLayout();
-        });
-        this.$message.success("重置成功");
-        this.$refs.crud.$refs.dialogColumn.columnBox = false;
+      async resetColumn() {
+          this.option = option;
+          const inSave = await this.delColumnData(this.getColumnName(2), option);
+          if (inSave) {
+              this.$nextTick(() => {
+                  this.$refs.crud.doLayout();
+              });
+              this.$message.success("重置成功");
+              this.$refs.crud.$refs.dialogColumn.columnBox = false;
+          }
+      },
+      handleCurrentChange(val) {
+          // this.currentRow = val;
+          this.params.pid = val.id
+          this.dialogPage.currentPage = 1;
+          this.dialogOnLoad(this.dialogPage);
       }
-    }
   },
   watch: {
-    option: function() {
-      this.search.businesDate = defaultDate();
-    },
-    dialogVisible:function (){
-      this.goodsListShow = []
-      this.goodsListSave = []
-      this.totalTwo = 0
-    }
+      option: function () {
+          this.search.businesDate = defaultDate();
+      },
+      dialogVisible: function () {
+          this.goodsListShow = []
+          this.goodsListSave = []
+          this.totalTwo = 0
+          listBYStatus({}).then(res => {
+              this.treeData = res.data.data
+          });
+      }
   }
 };
 </script>

src/views/exportTrade/salesContract/detailsPage.vue

@@ -1,26 +1,27 @@
 <template>
-  <div class="borderless" v-loading="pageLoading">
-    <div class="customer-head">
-      <div class="customer-back">
-        <el-button type="danger" style="border: none;background: none;color: red" icon="el-icon-arrow-left"
-          @click="backToList">返回列表
-        </el-button>
-      </div>
-      <div class="add-customer-btn" v-if="showBut">
-        <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--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-item disabled>撤销请核</el-dropdown-item>
-          </el-dropdown-menu>
-        </el-dropdown>
-        <el-dropdown style="margin-right: 8px;">
+    <div class="borderless" v-loading="pageLoading">
+        <div class="customer-head" style="height: 82px;">
+            <div class="customer-back">
+                <el-button type="danger" style="border: none;background: none;color: red" icon="el-icon-arrow-left"
+                           @click="backToList">返回列表
+                </el-button>
+            </div>
+            <div class="add-customer-btn" v-if="showBut">
+                <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--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-item disabled>撤销请核</el-dropdown-item>
+                    </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>
           </el-button>
@@ -29,102 +30,117 @@
             </el-dropdown-item>
             <el-dropdown-item @click.native="viewBill" :disabled="!form.id">查看账单</el-dropdown-item>
           </el-dropdown-menu>
-        </el-dropdown>
-        <el-dropdown style="margin-right: 8px;">
-          <el-button type="success" size="small">
-            业务处理<i class="el-icon-arrow-down el-icon--right"></i>
-          </el-button>
-          <el-dropdown-menu slot="dropdown">
-            <el-dropdown-item :disabled="!form.id" @click.native="copyDoc">复制单据</el-dropdown-item>
-          </el-dropdown-menu>
-        </el-dropdown>
-        <el-button type="primary" :disabled="disabled" @click="editCustomer" :loading="subLoading"
-          v-if="detailData.status != 1" size="small">保存数据
-        </el-button>
-      </div>
-    </div>
-    <div class="customer-main">
-      <trade-card title="业务进程">
-        <div class="content" style="height: 10px;">
-          <div class="content-item">
-            <div class="card">
-              <div class="card-content">
-                <span class="card-content-num selected">{{ form.fudaPurchaseStatus?form.fudaPurchaseStatus:'待采购' }}</span>
-              </div>
+                </el-dropdown>
+                <el-dropdown style="margin-right: 8px;">
+                    <el-button type="success" size="small">
+                        业务处理<i class="el-icon-arrow-down el-icon--right"></i>
+                    </el-button>
+                    <el-dropdown-menu slot="dropdown">
+                        <el-dropdown-item :disabled="!form.id" @click.native="copyDoc">复制单据</el-dropdown-item>
+                    </el-dropdown-menu>
+                </el-dropdown>
+                <el-button type="primary" :disabled="disabled" @click="editCustomer" :loading="subLoading"
+                           v-if="detailData.status != 1" size="small">保存数据
+                </el-button>
             </div>
-          </div>
-          <div class="divider"/>
-          <div class="content-item">
-            <div class="card">
-              <div class="card-content">
-                <span class="card-content-num" :class="form.productionScheduling?'selected':''">{{ form.productionScheduling?form.productionScheduling:'排产中' }}</span>
-              </div>
+            <div class="content" style="height: 10px;margin-top: 10px">
+                <div class="content-item">
+                    <div class="card">
+                        <div class="card-content">
+                            <span class="card-content-num selected">{{
+                                form.fudaPurchaseStatus ? form.fudaPurchaseStatus : '待采购'
+                                }}</span>
+                        </div>
+                    </div>
+                </div>
+                <div class="divider"/>
+                <div class="content-item">
+                    <div class="card">
+                        <div class="card-content">
+                            <span class="card-content-num" :class="form.productionScheduling?'selected':''">{{
+                                form.productionScheduling ? form.productionScheduling : '排产中'
+                                }}</span>
+                        </div>
+                    </div>
+                </div>
+                <div class="divider"/>
+                <div class="content-item">
+                    <div class="card">
+                        <div class="card-content">
+                            <span class="card-content-num" :class="form.estimateGoodGoods?'selected':''">{{
+                                form.estimateGoodGoods ? form.estimateGoodGoods : '预计货好'
+                                }}</span>
+                        </div>
+                    </div>
+                </div>
+                <div class="divider"/>
+                <div class="content-item">
+                    <div class="card">
+                        <div class="card-content">
+                            <span class="card-content-num" :class="form.documentaryStatus?'selected':''">{{
+                                form.documentaryStatus ? form.documentaryStatus : '待跟单'
+                                }}</span>
+                        </div>
+                    </div>
+                </div>
+                <div class="divider"/>
+                <div class="content-item">
+                    <div class="card">
+                        <div class="card-content">
+                            <span class="card-content-num" :class="form.depositReceived?'selected':''">{{
+                                form.depositReceived ? form.depositReceived : '定金到账'
+                                }}</span>
+                        </div>
+                    </div>
+                </div>
+                <div class="divider"/>
+                <div class="content-item">
+                    <div class="card">
+                        <div class="card-content">
+                            <span class="card-content-num" :class="form.balancePayment?'selected':''">{{
+                                form.balancePayment ? form.balancePayment : '尾款'
+                                }}</span>
+                        </div>
+                    </div>
+                </div>
             </div>
-          </div>
-          <div class="divider"/>
-          <div class="content-item">
-            <div class="card">
-              <div class="card-content">
-                <span class="card-content-num" :class="form.estimateGoodGoods?'selected':''">{{ form.estimateGoodGoods?form.estimateGoodGoods:'预计货好' }}</span>
-              </div>
-            </div>
-          </div>
-          <div class="divider"/>
-          <div class="content-item">
-            <div class="card">
-              <div class="card-content">
-                <span class="card-content-num" :class="form.documentaryStatus?'selected':''">{{ form.documentaryStatus?form.documentaryStatus:'待跟单' }}</span>
-              </div>
-            </div>
-          </div>
-          <div class="divider"/>
-          <div class="content-item">
-            <div class="card">
-              <div class="card-content">
-                <span class="card-content-num" :class="form.depositReceived?'selected':''">{{ form.depositReceived?form.depositReceived:'定金到账' }}</span>
-              </div>
-            </div>
-          </div>
-          <div class="divider"/>
-          <div class="content-item">
-            <div class="card">
-              <div class="card-content">
-                <span class="card-content-num" :class="form.balancePayment?'selected':''">{{ form.balancePayment?form.balancePayment:'尾款' }}</span>
-              </div>
-            </div>
-          </div>
         </div>
-      </trade-card>
-      <trade-card title="基础信息">
-        <avue-form ref="form" class="trading-form" v-model="form" :option="option">
-          <template slot="portOfLoad">
-            <port-info v-model="form.portOfLoad" :disabled="detailData.status == 1"/>
-          </template>
-          <template slot="portOfDestination">
-            <port-info v-model="form.portOfDestination" :disabled="detailData.status == 1"/>
-          </template>
-          <template slot-scope="{}" slot="corpIdLabel">
-            <span style="color: #409EFF;cursor: pointer" @click.stop="khEdit('kh')">客户名称:</span>
-          </template>
-          <template slot-scope="{}" slot="belongToCorpIdLabel"> <span style="color: #409EFF;cursor: pointer"
-              @click.stop="khEdit('GS')">公司主体:</span>
-          </template>
-          <template slot-scope="{}" slot="portOfLoadLabel"> <span style="color: #409EFF;cursor: pointer"
-              @click.stop="khEdit('portOfLoad')">起运港:</span>
-          </template> <template slot-scope="{}" slot="portOfDestinationLabel"> <span
-              style="color: #409EFF;cursor: pointer" @click.stop="khEdit('portOfLoad')">目的港:</span> </template>
-          <template slot="corpId">
-            <crop-select v-model="form.corpId" @getCorpData="getCorpData" corpType="KH"
-              :disabled="detailData.status == 1"></crop-select>
-          </template>
-          <template slot="belongToCorpId">
-            <crop-select v-model="form.belongToCorpId" corpType="GS" :disabled="detailData.status == 1"></crop-select>
-          </template>
-          <template slot="corpAttn">
-            <el-select size="small" v-model="form.corpAttn" placeholder="请选择" @change="corpAttnChange" clearable
-              :disabled="detailData.status == 1">
-              <el-option v-for="item in corpsattns" :key="item.id" :label="item.cname" :value="item.cname">
-              </el-option>
+        <div class="customer-main" style="margin-top: 85px">
+            <trade-card title="基础信息">
+                <avue-form ref="form" class="trading-form" v-model="form" :option="option">
+                    <template slot="portOfLoad">
+                        <port-info v-model="form.portOfLoad" :disabled="detailData.status == 1"/>
+                    </template>
+                    <template slot="portOfDestination">
+                        <port-info v-model="form.portOfDestination" :disabled="detailData.status == 1"/>
+                    </template>
+                    <template slot-scope="{}" slot="corpIdLabel">
+                        <span style="color: #409EFF;cursor: pointer" @click.stop="khEdit('kh')">客户名称:</span>
+                    </template>
+                    <template slot-scope="{}" slot="belongToCorpIdLabel"> <span style="color: #409EFF;cursor: pointer"
+                                                                                @click.stop="khEdit('GS')">公司主体:</span>
+                    </template>
+                    <template slot-scope="{}" slot="portOfLoadLabel"> <span style="color: #409EFF;cursor: pointer"
+                                                                            @click.stop="khEdit('portOfLoad')">起运港:</span>
+                    </template>
+                    <template slot-scope="{}" slot="portOfDestinationLabel"> <span
+                            style="color: #409EFF;cursor: pointer" @click.stop="khEdit('portOfLoad')">目的港:</span>
+                    </template>
+                    <template slot="corpId">
+                        <crop-select v-model="form.corpId" @getCorpData="getCorpData" corpType="KH"
+                                     :disabled="detailData.status == 1"></crop-select>
+                    </template>
+                    <template slot="belongToCorpId">
+                        <crop-select v-model="form.belongToCorpId" corpType="GS"
+                                     :disabled="detailData.status == 1"></crop-select>
+                    </template>
+                    <template slot="corpAttn">
+                        <el-select size="small" v-model="form.corpAttn" placeholder="请选择" @change="corpAttnChange"
+                                   clearable
+                                   :disabled="detailData.status == 1">
+                            <el-option v-for="item in corpsattns" :key="item.id" :label="item.cname"
+                                       :value="item.cname">
+                            </el-option>
             </el-select>
           </template>
           <template slot="priceTerms">

src/views/paymentManagement/parameterConfiguration/index.vue

@@ -161,6 +161,33 @@ export default {
           width: 90,
           overHidden: true
         }, {
+          label: "MD5交易密钥",
+          prop: "sybMdAppkey",
+          width: 100,
+          labelWidth: 110,
+          overHidden: true
+        }, {
+          label: "RSA公钥",
+          prop: "sybRsacusprikey",
+          width: 100,
+          overHidden: true
+        }, {
+          label: "RSA2公钥",
+          prop: "sybRsatlpubkey",
+          width: 100,
+          overHidden: true
+        }, {
+          label: "商户sm2私钥",
+          prop: "sybSmpprivatekey",
+          width: 100,
+          overHidden: true
+        }, {
+          label: "通联平台sm2公钥",
+          prop: "sybSmtlpubkey",
+          width: 150,
+          labelWidth: 120,
+          overHidden: true
+        }, {
           label: "备注",
           prop: "remarks",
           width: 200,

src/views/productLaunch/index.vue

@@ -137,6 +137,11 @@ export default {
           disabled: true,
           search: true,
         }, {
+          label: '仓库',
+          prop: 'storage',
+          overHidden: true,
+          disabled: true,
+        }, {
           label: '库存',
           prop: 'balance',
           overHidden: true,