Browse Source

提交陆运和木材

caojunjie 2 years ago
parent
commit
e0d339d245

+ 1 - 1
src/views/landTransportation/placeAnOrder/detailPage.vue

@@ -1113,7 +1113,7 @@ export default {
           label: '运输调度',
           prop: 'dispatcher',
           type: "select",
-          dicUrl: "/api/blade-user/userList?deptPid={{key}}",
+          dicUrl: "/api/blade-user/deptUserList?deptPid={{key}}",
           props: {
             label: "realName",
             value: "id"

+ 100 - 111
src/views/purchasingManagement/inStock/config/customerContact.json

@@ -48,17 +48,8 @@
   "column": [
     {
       "index": 1,
-      "prop": "containerNo",
-      "label": "箱号",
-      "overHidden": true,
-      "cell": true,
-      "width": 100
-    },
-    {
-      "index": 2,
-      "prop": "storageId",
-      "label": "*库区",
-      "overHidden": true,
+      "prop": "itemId",
+      "label": "*品名",
       "type": "select",
       "props": {
         "label": "cname",
@@ -66,6 +57,7 @@
       },
       "dicData": [],
       "filterable": true,
+      "overHidden": true,
       "cell": true,
       "rules": [
         {
@@ -77,31 +69,25 @@
       "width": 100
     },
     {
+      "index": 2,
+      "prop": "length",
+      "label": "长度(m)",
+      "overHidden": true,
+      "cell": true,
+      "width": 100
+    },
+    {
       "index": 3,
-      "prop": "itemId",
-      "label": "*品名",
-      "type": "select",
-      "props": {
-        "label": "cname",
-        "value": "id"
-      },
-      "dicData": [],
-      "filterable": true,
+      "prop": "thickness",
+      "label": "厚度(m)",
       "overHidden": true,
       "cell": true,
-      "rules": [
-        {
-          "required": true,
-          "message": "请选择",
-          "trigger": "blur"
-        }
-      ],
       "width": 100
     },
     {
       "index": 4,
-      "prop": "itemType",
-      "label": "*品牌",
+      "prop": "billNo",
+      "label": "*捆包号",
       "overHidden": true,
       "cell": true,
       "rules": [
@@ -115,8 +101,8 @@
     },
     {
       "index": 5,
-      "prop": "grade",
-      "label": "*等级",
+      "prop": "storageInQuantity",
+      "label": "*入库量",
       "overHidden": true,
       "cell": true,
       "rules": [
@@ -130,44 +116,54 @@
     },
     {
       "index": 6,
-      "prop": "length",
-      "label": "长度(m)",
+      "prop": "price",
+      "label": "*入库单价",
       "overHidden": true,
       "cell": true,
+      "rules": [
+        {
+          "required": true,
+          "message": "请输入",
+          "trigger": "blur"
+        }
+      ],
       "width": 100
     },
     {
-      "index": 8,
-      "prop": "thickness",
-      "label": "厚度(m)",
+      "index": 7,
+      "prop": "storageAmount",
+      "label": "入库金额",
       "overHidden": true,
       "cell": true,
       "width": 100
     },
     {
-      "index": 10,
-      "prop": "billNo",
-      "label": "*捆包号",
+      "index": 8,
+      "prop": "unit",
+      "label": "*入库单位",
       "overHidden": true,
+      "type": "select",
+      "props": {
+        "label": "dictValue",
+        "value": "dictKey"
+      },
+      "dicData": [],
       "cell": true,
       "rules": [
         {
           "required": true,
-          "message": "请输入",
+          "message": "请选择",
           "trigger": "blur"
         }
       ],
       "width": 100
     },
     {
-      "index": 11,
-      "prop": "sliceNumber",
-      "label": "*片数",
+      "index": 9,
+      "prop": "grade",
+      "label": "*等级",
       "overHidden": true,
       "cell": true,
-      "type": "number",
-      "controls": false,
-      "precision": 0,
       "rules": [
         {
           "required": true,
@@ -176,49 +172,64 @@
         }
       ],
       "width": 100
-    },
-    {
-      "index": 12,
-      "prop": "storageInQuantity",
-      "label": "*入库量",
+    },{
+      "index": 10,
+      "prop": "storageId",
+      "label": "*库区",
       "overHidden": true,
+      "type": "select",
+      "props": {
+        "label": "cname",
+        "value": "id"
+      },
+      "dicData": [],
+      "filterable": true,
       "cell": true,
       "rules": [
         {
           "required": true,
-          "message": "请输入",
+          "message": "请选择",
           "trigger": "blur"
         }
       ],
       "width": 100
-    },
-    {
-      "index": 13,
-      "prop": "unit",
-      "label": "*入库单位",
+    },{
+      "index": 11,
+      "prop": "containerNo",
+      "label": "箱号",
+      "overHidden": true,
+      "cell": true,
+      "width": 100
+    },{
+      "index": 12,
+      "prop": "itemType",
+      "label": "*品牌",
       "overHidden": true,
-      "type": "select",
-      "props": {
-        "label": "dictValue",
-        "value": "dictKey"
-      },
-      "dicData": [],
       "cell": true,
       "rules": [
         {
           "required": true,
-          "message": "请选择",
+          "message": "请输入",
           "trigger": "blur"
         }
       ],
       "width": 100
-    },
-    {
+    },{
+      "index": 13,
+      "prop": "itemProp",
+      "label": "产地",
+      "overHidden": true,
+      "cell": true,
+      "width": 100
+    },{
       "index": 14,
-      "prop": "price",
-      "label": "*入库单价",
+      "prop": "sliceNumber",
+      "label": "*片数",
       "overHidden": true,
       "cell": true,
+      "type": "number",
+      "controls": false,
+      "precision": 0,
       "rules": [
         {
           "required": true,
@@ -227,67 +238,49 @@
         }
       ],
       "width": 100
-    },
-    {
+    },{
       "index": 15,
-      "prop": "storageAmount",
-      "label": "入库金额",
+      "prop": "forklift",
+      "label": "叉车工",
       "overHidden": true,
       "cell": true,
       "width": 100
     },
     {
       "index": 16,
-      "prop": "itemProp",
-      "label": "产地",
+      "prop": "carry",
+      "label": "搬运工",
       "overHidden": true,
       "cell": true,
       "width": 100
-    },
-    {
+    },{
       "index": 17,
-      "prop": "oneCode",
-      "label": "一维码",
-      "overHidden": true,
-      "width": 100
-    },
-    {
-      "index": 18,
-      "prop": "qrCode",
-      "label": "二维码",
-      "overHidden": true,
-      "width": 100
-    },
-    {
-      "index": 19,
       "prop": "inventory",
       "label": "盘点量",
       "overHidden": true,
       "width": 100
-    },
-    {
-      "index": 20,
+    },{
+      "index": 18,
       "prop": "balanceNumber",
       "label": "结余量",
       "overHidden": true,
       "width": 100
-    },
-    {
-      "index": 21,
+    },{
+      "index": 19,
       "prop": "balanceMoney",
       "label": "结余金额",
       "overHidden": true,
       "width": 100
     },
     {
-      "index": 22,
+      "index": 20,
       "prop": "surplusLoss",
       "label": "盈亏量",
       "overHidden": true,
       "width": 100
     },
     {
-      "index": 23,
+      "index": 21,
       "prop": "isIssue",
       "label": "库存状态",
       "overHidden": true,
@@ -326,25 +319,21 @@
         }
       ],
       "width": 100
-    },
-    {
-      "index": 24,
-      "prop": "forklift",
-      "label": "叉车工",
+    },{
+      "index": 22,
+      "prop": "oneCode",
+      "label": "一维码",
       "overHidden": true,
-      "cell": true,
       "width": 100
     },
     {
-      "index": 25,
-      "prop": "carry",
-      "label": "搬运工",
+      "index": 23,
+      "prop": "qrCode",
+      "label": "二维码",
       "overHidden": true,
-      "cell": true,
       "width": 100
-    },
-    {
-      "index": 26,
+    },{
+      "index": 24,
       "prop": "remarks",
       "label": "备注",
       "overHidden": true,

+ 161 - 118
src/views/purchasingManagement/inStock/detailsPage.vue

@@ -3,12 +3,12 @@
     <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">返回列表
+                   @click="backToList">返回列表
         </el-button>
       </div>
       <div class="add-customer-btn">
         <el-button type="primary" size="small" :disabled="form.status>0" v-if="form.status < 1"
-          class="el-button--small-yh " @click.stop="openEdit">编辑
+                   class="el-button--small-yh " @click.stop="openEdit">编辑
         </el-button>
         <el-button type="info" @click="getData" size="small">刷新资料
         </el-button>
@@ -19,7 +19,7 @@
                    class="el-button--small-yh " @click.stop="withdraw(1)">撤销
         </el-button>
         <el-button type="primary" @click="editCustomer" :loading="subLoading" v-if="!(form.status > 0)"
-          size="small">保存数据
+                   size="small">保存数据
         </el-button>
         <el-dropdown style="padding: 0 6px;line-height: 0">
           <el-button type="primary" size="small" :loading="subLoading" :disabled="!form.id">
@@ -27,10 +27,13 @@
           </el-button>
           <el-dropdown-menu slot="dropdown">
             <el-dropdown-item :disabled="form.status != 2" @click.native="auditCheck">提交审核</el-dropdown-item>
-            <el-dropdown-item v-if="roleName=='admin'" :disabled="form.status != 5" @click.native="revokeCheck">撤销审核</el-dropdown-item>
+            <el-dropdown-item v-if="roleName=='admin'" :disabled="form.status != 5" @click.native="revokeCheck">
+              撤销审核
+            </el-dropdown-item>
             <el-dropdown-item :disabled="form.status < 3" @click.native="checkScheduleDialog = true">审核进度
             </el-dropdown-item>
-            <el-dropdown-item v-if="$route.query.check" :disabled="!(form.status > 2 && form.status < 5)" @click.native="check">审批数据
+            <el-dropdown-item v-if="$route.query.check" :disabled="!(form.status > 2 && form.status < 5)"
+                              @click.native="check">审批数据
             </el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
@@ -41,50 +44,51 @@
         <avue-form ref="form" class="trading-form" v-model="form" :option="option">
           <template slot="purchaserId">
             <crop-select ref="purchaser" v-model="form.purchaserId" corpType="KH" :refresh="false"
-              @getCorpData="getKHData" :disabled="detailData.status == 1"></crop-select>
+                         @getCorpData="getKHData" :disabled="detailData.status == 1"></crop-select>
           </template>
           <template slot="corpId">
             <crop-select ref="corpId" v-model="form.corpId" corpType="GYS" :refresh="false" @getCorpData="getGYSData"
-              :disabled="detailData.status == 1"></crop-select>
+                         :disabled="detailData.status == 1"></crop-select>
           </template>
           <template slot="storageId">
             <el-cascader v-model="form.storageId" :options="storagetreeList" :show-all-levels="false"
-              :disabled="detailData.status == 1" :props="{ checkStrictly: true, emitPath: false, label: 'title' }"
-              clearable @change="storagetreeChange">
+                         :disabled="detailData.status == 1"
+                         :props="{ checkStrictly: true, emitPath: false, label: 'title' }"
+                         clearable @change="storagetreeChange">
             </el-cascader>
           </template>
           <template slot-scope="{column}" slot="purchaserIdLabel">
-            <span style="color: #409EFF;cursor: pointer" @click.stop="addData(column.prop)">{{column.label}}</span>
+            <span style="color: #409EFF;cursor: pointer" @click.stop="addData(column.prop)">{{ column.label }}</span>
           </template>
           <template slot-scope="{column}" slot="corpIdLabel">
-            <span style="color: #409EFF;cursor: pointer" @click.stop="addData(column.prop)">{{column.label}}</span>
+            <span style="color: #409EFF;cursor: pointer" @click.stop="addData(column.prop)">{{ column.label }}</span>
           </template>
           <template slot-scope="{column}" slot="storageIdLabel">
-            <span style="color: #409EFF;cursor: pointer" @click.stop="addData('storage')">{{column.label}}</span>
+            <span style="color: #409EFF;cursor: pointer" @click.stop="addData('storage')">{{ column.label }}</span>
           </template>
         </avue-form>
       </trade-card>
       <trade-card title="入库明细">
         <avue-crud ref="crud" :data="itemsVOList" :option="tableOption" @row-del="rowDel" @saveColumn="saveColumn"
-          @resetColumn="resetColumn" :cell-style="cellStyle" @row-save="rowSave" @row-update="addUpdate">
+                   @resetColumn="resetColumn" :cell-style="cellStyle" @row-save="rowSave" @row-update="addUpdate">
           <template slot="menuLeft">
             <el-button type="primary" icon="el-icon-plus" size="small" :disabled="detailData.status == 1"
-              @click.stop="addRow">录入明细
+                       @click.stop="addRow">录入明细
             </el-button>
             <!--            <el-button type="success" icon="el-icon-bottom" size="small" @click.stop="getTemplate">下载模板</el-button>-->
             <el-button type="info" icon="el-icon-top" size="small" :disabled="detailData.status == 1&&form.id"
-              @click.stop="excelBox = true">导入
+                       @click.stop="excelBox = true">导入
             </el-button>
           </template>
           <template slot="headerSerial">
             <el-button type="primary" icon="el-icon-plus" size="mini" @click.stop="addRow"
-              :disabled="detailData.status == 1" circle></el-button>
+                       :disabled="detailData.status == 1" circle></el-button>
           </template>
           <template slot="storageIdHeader" slot-scope="{column}">
-            <span style="color: #409EFF;cursor: pointer" @click.stop="addData(column.prop)">{{column.label}}</span>
+            <span style="color: #409EFF;cursor: pointer" @click.stop="addData(column.prop)">{{ column.label }}</span>
           </template>
           <template slot="itemIdHeader" slot-scope="{column}">
-            <span style="color: #409EFF;cursor: pointer" @click.stop="addData(column.prop)">{{column.label}}</span>
+            <span style="color: #409EFF;cursor: pointer" @click.stop="addData(column.prop)">{{ column.label }}</span>
           </template>
           <template slot="oneCode" slot-scope="{ row, index }">
             <el-popover placement="right" width="160" trigger="click">
@@ -100,27 +104,30 @@
           </template>
           <template slot="storageInQuantityForm" slot-scope="{ row }">
             <el-input-number size="small" v-model="row.storageInQuantity" @change="calculateChange(row)"
-              :controls="false" style="width:100%" placeholder="请输入"></el-input-number>
+                             :controls="false" style="width:100%" placeholder="请输入"></el-input-number>
           </template>
           <template slot="priceForm" slot-scope="{ row }">
             <el-input-number size="small" v-model="row.price" @change="calculateChange(row)" :controls="false"
-              style="width:100%" placeholder="请输入"></el-input-number>
+                             style="width:100%" placeholder="请输入"></el-input-number>
           </template>
           <template slot="menu" slot-scope="{ row, index }">
             <div style="display:flex;justify-content: center;">
               <el-button size="small" icon="el-icon-edit" type="text" @click="rowCell(row, index)"
-                :disabled="disabled || detailData.status == 1">{{ row.$cellEdit ? "保存" : "编辑" }}</el-button>
+                         :disabled="disabled || detailData.status == 1">{{ row.$cellEdit ? "保存" : "编辑" }}
+              </el-button>
               <el-button size="small" icon="el-icon-delete" type="text" @click="rowDel(row, index)"
-                :disabled="detailData.status == 1">删除</el-button>
+                         :disabled="detailData.status == 1">删除
+              </el-button>
               <el-button size="small" icon="el-icon-printer" type="text" @click="rowPrint(row, index)"
-                :disabled="!row.id">
-                打印</el-button>
+                         :disabled="!row.id">
+                打印
+              </el-button>
               <div style="display:flex;flex-direction: column;justify-content: center;margin-left: 10px;">
                 <el-tooltip effect="dark" content="向上移动" placement="top">
                   <i v-if="index != 0&&detailData.status != 1" :disabled="disabled || detailData.status == 1"
-                    class="el-icon-arrow-up" @click="moveUp(row, index)" style="color:#409EFF;"></i>
+                     class="el-icon-arrow-up" @click="moveUp(row, index)" style="color:#409EFF;"></i>
                 </el-tooltip>
-                <el-tooltip effect="dark" content="向下移动" placement="bottom"> <i
+                <el-tooltip effect="dark" content="向下移动" placement="bottom"><i
                     v-if="index != (itemsVOList.length - 1)&&detailData.status != 1" class="el-icon-arrow-down"
                     @click="moveDown(row, index)" style="color:#409EFF;"></i></el-tooltip>
               </div>
@@ -130,21 +137,21 @@
         </avue-crud>
       </trade-card>
       <fee-info ref="feeInfo" :orderFeesList="orderFeesList" :disabled="detailData.status == 1"
-        feeUrl="/blade-purchase-sales/entranceOrder/removeOrderFees" :optionType="'CMY'" :itemType="'C'"
-        :inCropId="true" @beforeFinance="beforeFinance" :delType="2" :billingShow="false" />
+                feeUrl="/blade-purchase-sales/entranceOrder/removeOrderFees" :optionType="'CMY'" :itemType="'C'"
+                :inCropId="true" @beforeFinance="beforeFinance" :delType="2" :billingShow="false"/>
       <!-- <upload-file ref="uploadFile" title="合同附件" :disabled="detailData.status == 1" :orderFilesList="orderFilesList"
         delUrl="" /> -->
       <containerTitle title="上传附件"></containerTitle>
       <c-upload typeUpload="CD" deleteUrl="/api/trade-purchase/woodHarvestingCloud/removeByFileId"
-        :data="orderFilesList" display :enumerationValue="85.6" :disabled="detailData.status == 1"></c-upload>
+                :data="orderFilesList" display :enumerationValue="85.6" :disabled="detailData.status == 1"></c-upload>
 
       <el-dialog append-to-body title="审核进度" class="el-dialogDeep" :visible.sync="checkScheduleDialog" width="40%"
-        :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>
+                 :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>
         <check-schedule :checkId="form.id" :batchNo="batchNo" @choceScheduleFun="choceScheduleFun">
         </check-schedule>
       </el-dialog>
       <el-dialog append-to-body title="审批" class="el-dialogDeep" :visible.sync="checkDialog" width="50%"
-        :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>
+                 :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>
         <check :checkData="checkData" :checkDetail="false" :idList="[]" @choceCheckFun="choceCheckFun">
         </check>
       </el-dialog>
@@ -165,15 +172,26 @@
 </template>
 
 <script>
-import { detail, submit, checkWarehousing, getStoragetree, getStorage, getAllgoods, delItem, revokeWarehousing, withdraw} from "@/api/purchasingManagement/inStock";
+import {
+  detail,
+  submit,
+  checkWarehousing,
+  getStoragetree,
+  getStorage,
+  getAllgoods,
+  delItem,
+  revokeWarehousing,
+  withdraw
+} from "@/api/purchasingManagement/inStock";
 import tableOption from "./config/customerContact.json";
 import feeInfo from "@/components/fee-info/main";
 import checkSchedule from "../../../components/check/checkSchedule";
 import uploadFile from "@/components/upload-file/main";
-import { getToken } from "@/util/auth";
-import { contrastObj, contrastList, contrastList2 } from "@/util/contrastData";
-import {validatenull } from '@/util/validate'
+import {getToken} from "@/util/auth";
+import {contrastObj, contrastList, contrastList2} from "@/util/contrastData";
+import {validatenull} from '@/util/validate'
 import check from "@/components/check/check";
+
 export default {
   name: "detailsPageEdit",
   data() {
@@ -277,6 +295,19 @@ export default {
             span: 6
           },
           {
+            label: "审核状态",
+            prop: "status",
+            type: "select",
+            dataType: 'number',
+            props: {
+              label: "dictValue",
+              value: "dictKey"
+            },
+            dicData: [],
+            disabled: true,
+            span: 6
+          },
+          {
             label: "供应商",
             prop: "corpId",
             span: 6
@@ -288,24 +319,37 @@ export default {
             span: 6
           },
           {
-            label: "审核状态",
-            prop: "status",
+            label: "是否融资",
+            prop: "arrival",
             type: "select",
             dataType: 'number',
-            props: {
-              label: "dictValue",
-              value: "dictKey"
+            value: 0,
+            dicData: [
+              {
+                label: "是",
+                value: 1
+              }, {
+                label: "否",
+                value: 0
+              }
+            ],
+            change: (data) => {
+              if (data.value == 0) {
+                this.findObject(this.tableOption.column, "price").label = "入库单价"
+                this.findObject(this.tableOption.column, "price").rules.required = false
+              } else {
+                this.findObject(this.tableOption.column, "price").label = "*入库单价"
+                this.findObject(this.tableOption.column, "price").rules.required = true
+              }
             },
-            dicData: [],
-            disabled: true,
             span: 6
           },
           {
             label: "备注",
             prop: "orderRemark",
             type: "textarea",
-            minRows: 2,
-            span: 18
+            minRows: 1,
+            span: 12
           },
         ]
       },
@@ -341,19 +385,19 @@ export default {
       this.getDetail(this.detailData.id);
     }
     this.tableOption = await this.getColumnData(
-      this.getColumnName(189),
-      tableOption
+        this.getColumnName(189),
+        tableOption
     );
     getStoragetree().then(res => {
       this.storagetreeList = res.data.data;
     })
     this.getWorkDicts("approval_status").then(res => {
       this.findObject(this.option.column, "status").dicData =
-        res.data.data;
+          res.data.data;
     });
     this.getWorkDicts("CMY_business_type").then(res => {
       this.findObject(this.option.column, "businessType").dicData =
-        res.data.data;
+          res.data.data;
     });
     this.getAllWorkDicts()
   },
@@ -369,7 +413,7 @@ export default {
     getData() {
       getAllgoods().then(res => {
         this.findObject(this.tableOption.column, "itemId").dicData =
-          res.data.data;
+            res.data.data;
       })
       getStoragetree().then(res => {
         this.storagetreeList = res.data.data;
@@ -381,18 +425,18 @@ export default {
     getAllWorkDicts() {
       getAllgoods().then(res => {
         this.findObject(this.tableOption.column, "itemId").dicData =
-          res.data.data;
+            res.data.data;
       })
       this.getWorkDicts("unit").then(res => {
         this.findObject(this.tableOption.column, "unit").dicData =
-          res.data.data;
+            res.data.data;
       });
     },
     cellStyle() {
       return "padding:0;height:40px;";
     },
     getStorage() {
-      getStorage({ storageTypeId: this.form.storageId }).then(res => {
+      getStorage({storageTypeId: this.form.storageId}).then(res => {
         this.findObject(this.tableOption.column, "storageId").dicData = res.data;
       })
     },
@@ -430,7 +474,7 @@ export default {
       this.$refs["form"].validate((valid, done) => {
         done();
         if (valid) {
-          this.itemsVOList.push({ $cellEdit: true, unit: '1' });
+          this.itemsVOList.push({$cellEdit: true, unit: '1'});
           this.getStorage()
         } else {
           return false;
@@ -454,7 +498,7 @@ export default {
         type: "warning"
       }).then(() => {
         if (row.id) {
-          delItem({ itemId: row.id }).then(res => {
+          delItem({itemId: row.id}).then(res => {
             this.$message({
               type: "success",
               message: "删除成功!"
@@ -473,27 +517,27 @@ export default {
     getDetail(id) {
       this.pageLoading = true;
       detail(id)
-        .then(res => {
-          this.form = res.data.data;
-          this.itemsVOList = res.data.data.itemsVOList;
-          this.orderFeesList = res.data.data.orderFeesList;
-          this.orderFilesList = res.data.data.orderFilesList;
-          this.oldform = this.deepClone(res.data.data);
-          this.olditemsVOList = this.deepClone(res.data.data.itemsVOList);
-          this.oldorderFeesList = this.deepClone(res.data.data.orderFeesList);
-          this.oldorderFilesList = this.deepClone(res.data.data.orderFilesList);
-          this.getStorage()
-        })
-        .finally(() => {
-          this.pageLoading = false;
-        });
+          .then(res => {
+            this.form = res.data.data;
+            this.itemsVOList = res.data.data.itemsVOList;
+            this.orderFeesList = res.data.data.orderFeesList;
+            this.orderFilesList = res.data.data.orderFilesList;
+            this.oldform = this.deepClone(res.data.data);
+            this.olditemsVOList = this.deepClone(res.data.data.itemsVOList);
+            this.oldorderFeesList = this.deepClone(res.data.data.orderFeesList);
+            this.oldorderFilesList = this.deepClone(res.data.data.orderFilesList);
+            this.getStorage()
+          })
+          .finally(() => {
+            this.pageLoading = false;
+          });
     },
     rowPrint(row) {
       this.$router.push(`/myiframe/urlPath?name=preview-木材管理-入库垛卡.ureport.xml&src=${this.website.reportUrl}/preview?_u=blade-木材管理-入库垛卡.ureport.xml&id=${row.id}`);
     },
     //提交撤销
-    withdraw(type){
-      if (type == 0){
+    withdraw(type) {
+      if (type == 0) {
         this.$confirm("是否确认提交?", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
@@ -501,11 +545,11 @@ export default {
         }).then(() => {
           this.subLoading = true;
           withdraw({
-            id:this.form.id,
-            type:"RK",
-            status:1,
-            isIssue:1
-          }).then(res=>{
+            id: this.form.id,
+            type: "RK",
+            status: 1,
+            isIssue: 1
+          }).then(res => {
             this.$message({
               type: "success",
               message: "提交成功!"
@@ -514,7 +558,7 @@ export default {
             this.subLoading = false;
           })
         })
-      }else {
+      } else {
         this.$confirm("是否确认撤销?", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
@@ -522,11 +566,11 @@ export default {
         }).then(() => {
           this.subLoading = true;
           withdraw({
-            id:this.form.id,
-            type:"RK",
-            status:0,
-            isIssue:0
-          }).then(res=>{
+            id: this.form.id,
+            type: "RK",
+            status: 0,
+            isIssue: 0
+          }).then(res => {
             this.$message({
               type: "success",
               message: "撤销成功!"
@@ -543,32 +587,32 @@ export default {
         done();
         if (valid) {
           for (let i = 0; i < this.itemsVOList.length; i++) {
-            if(validatenull(this.itemsVOList[i].storageId)){
-              return this.$message.error('请完善第'+(i+1)+'行的库区')
+            if (validatenull(this.itemsVOList[i].storageId)) {
+              return this.$message.error('请完善第' + (i + 1) + '行的库区')
             }
-            if(validatenull(this.itemsVOList[i].itemId)){
-              return this.$message.error('请完善第'+(i+1)+'行的品名')
+            if (validatenull(this.itemsVOList[i].itemId)) {
+              return this.$message.error('请完善第' + (i + 1) + '行的品名')
             }
-            if(validatenull(this.itemsVOList[i].itemType)){
-              return this.$message.error('请完善第'+(i+1)+'行的品牌')
+            if (validatenull(this.itemsVOList[i].itemType)) {
+              return this.$message.error('请完善第' + (i + 1) + '行的品牌')
             }
-            if(validatenull(this.itemsVOList[i].grade)){
-              return this.$message.error('请完善第'+(i+1)+'行的等级')
+            if (validatenull(this.itemsVOList[i].grade)) {
+              return this.$message.error('请完善第' + (i + 1) + '行的等级')
             }
-            if(validatenull(this.itemsVOList[i].billNo)){
-              return this.$message.error('请完善第'+(i+1)+'行的捆包号')
+            if (validatenull(this.itemsVOList[i].billNo)) {
+              return this.$message.error('请完善第' + (i + 1) + '行的捆包号')
             }
-            if(validatenull(this.itemsVOList[i].sliceNumber)){
-              return this.$message.error('请完善第'+(i+1)+'行的片数')
+            if (validatenull(this.itemsVOList[i].sliceNumber)) {
+              return this.$message.error('请完善第' + (i + 1) + '行的片数')
             }
-            if(validatenull(this.itemsVOList[i].storageInQuantity)){
-              return this.$message.error('请完善第'+(i+1)+'行的入库量')
+            if (validatenull(this.itemsVOList[i].storageInQuantity)) {
+              return this.$message.error('请完善第' + (i + 1) + '行的入库量')
             }
-            if(validatenull(this.itemsVOList[i].unit)){
-              return this.$message.error('请完善第'+(i+1)+'行的入库单位')
+            if (validatenull(this.itemsVOList[i].unit)) {
+              return this.$message.error('请完善第' + (i + 1) + '行的入库单位')
             }
-            if(validatenull(this.itemsVOList[i].price)){
-              return this.$message.error('请完善第'+(i+1)+'行的入库单价')
+            if (validatenull(this.itemsVOList[i].price)) {
+              return this.$message.error('请完善第' + (i + 1) + '行的入库单价')
             }
           }
           this.itemsVOList.forEach((e, index) => {
@@ -600,9 +644,9 @@ export default {
               this.$emit("goBack");
             }
           })
-            .finally(() => {
-              this.subLoading = false;
-            });
+              .finally(() => {
+                this.subLoading = false;
+              });
         } else {
           return false;
         }
@@ -736,22 +780,22 @@ export default {
     backToList() {
       let orderFeesList = this.$refs.feeInfo.submitData();
       if (
-        contrastObj(this.form, this.oldform) ||
-        contrastList(this.itemsVOList, this.olditemsVOList) ||
-        contrastList2(orderFeesList, this.oldorderFeesList) ||
-        contrastList(this.orderFilesList, this.oldorderFilesList)
+          contrastObj(this.form, this.oldform) ||
+          contrastList(this.itemsVOList, this.olditemsVOList) ||
+          contrastList2(orderFeesList, this.oldorderFeesList) ||
+          contrastList(this.orderFilesList, this.oldorderFilesList)
       ) {
         this.$confirm("数据发生变化未有提交记录, 是否提交?", "提示", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
         })
-          .then(() => {
-            this.editCustomer("goBack");
-          })
-          .catch(() => {
-            this.$emit("goBack");
-          });
+            .then(() => {
+              this.editCustomer("goBack");
+            })
+            .catch(() => {
+              this.$emit("goBack");
+            });
       } else {
         this.$emit("goBack");
       }
@@ -763,8 +807,8 @@ export default {
     },
     async saveColumn() {
       const inSave = await this.saveColumnData(
-        this.getColumnName(189),
-        this.tableOption
+          this.getColumnName(189),
+          this.tableOption
       );
       if (inSave) {
         this.$nextTick(() => {
@@ -784,8 +828,8 @@ export default {
     async resetColumn() {
       this.tableOption = tableOption;
       const inSave = await this.delColumnData(
-        this.getColumnName(189),
-        tableOption
+          this.getColumnName(189),
+          tableOption
       );
       if (inSave) {
         this.$nextTick(() => {
@@ -802,8 +846,7 @@ export default {
       }
     }
   },
-  watch: {
-  }
+  watch: {}
 };
 </script>
 

+ 103 - 115
src/views/salesManagement/outStock/config/customerContact.json

@@ -35,60 +35,57 @@
       "decimals": 2
     }
   ],
-  "column": [
-    {
-      "index": 1,
-      "prop": "containerNo",
-      "label": "箱号",
-      "overHidden": true,
-      "width": 100
+  "column": [{
+    "index": 1,
+    "prop": "itemId",
+    "label": "*品名",
+    "type": "select",
+    "props": {
+      "label": "cname",
+      "value": "id"
     },
+    "dicData": [],
+    "overHidden": true,
+    "filterable":true,
+    "rules": [
+      {
+        "required": true,
+        "message": "请选择",
+        "trigger": "blur"
+      }
+    ],
+    "width": 100
+  },{
+    "index": 2,
+    "prop": "length",
+    "label": "长度(m)",
+    "overHidden": true,
+    "width": 100
+  },
     {
-      "index": 2,
-      "prop": "storageId",
-      "label": "*库区",
+      "index": 3,
+      "prop": "thickness",
+      "label": "厚度(m)",
       "overHidden": true,
-      "type": "select",
-      "props": {
-        "label": "cname",
-        "value": "id"
-      },
-      "dicData": [],
-      "filterable":true,
-      "rules": [
-        {
-          "required": true,
-          "message": "请选择",
-          "trigger": "blur"
-        }
-      ],
       "width": 100
     },
     {
-      "index": 3,
-      "prop": "itemId",
-      "label": "*品名",
-      "type": "select",
-      "props": {
-        "label": "cname",
-        "value": "id"
-      },
-      "dicData": [],
+      "index": 4,
+      "prop": "billNo",
+      "label": "*捆包号",
       "overHidden": true,
-      "filterable":true,
       "rules": [
         {
           "required": true,
-          "message": "请选择",
+          "message": "请输入",
           "trigger": "blur"
         }
       ],
       "width": 100
-    },
-    {
-      "index": 4,
-      "prop": "itemType",
-      "label": "*品牌",
+    },{
+      "index": 5,
+      "prop": "storageInQuantity",
+      "label": "*出库量",
       "overHidden": true,
       "rules": [
         {
@@ -98,11 +95,10 @@
         }
       ],
       "width": 100
-    },
-    {
-      "index": 5,
-      "prop": "grade",
-      "label": "*等级",
+    },{
+      "index": 6,
+      "prop": "price",
+      "label": "*出库单价",
       "overHidden": true,
       "rules": [
         {
@@ -112,43 +108,36 @@
         }
       ],
       "width": 100
-    },
-    {
-      "index": 6,
-      "prop": "length",
-      "label": "长度(m)",
+    },{
+      "index": 7,
+      "prop": "storageAmount",
+      "label": "出库金额",
       "overHidden": true,
       "width": 100
-    },
-    {
+    },{
       "index": 8,
-      "prop": "thickness",
-      "label": "厚度(m)",
-      "overHidden": true,
-      "width": 100
-    },
-    {
-      "index": 10,
-      "prop": "billNo",
-      "label": "*捆包号",
+      "prop": "unit",
+      "label": "*出库单位",
       "overHidden": true,
+      "type": "select",
+      "props": {
+        "label": "dictValue",
+        "value": "dictKey"
+      },
+      "dicData": [],
       "rules": [
         {
           "required": true,
-          "message": "请输入",
+          "message": "请选择",
           "trigger": "blur"
         }
       ],
       "width": 100
-    },
-    {
-      "index": 11,
-      "prop": "sliceNumber",
-      "label": "*片数",
+    },{
+      "index": 9,
+      "prop": "grade",
+      "label": "*等级",
       "overHidden": true,
-      "type":"number",
-      "controls":false,
-      "precision":0,
       "rules": [
         {
           "required": true,
@@ -159,44 +148,58 @@
       "width": 100
     },
     {
-      "index": 12,
-      "prop": "storageInQuantity",
-      "label": "*出库量",
+      "index": 10,
+      "prop": "storageId",
+      "label": "*库区",
       "overHidden": true,
+      "type": "select",
+      "props": {
+        "label": "cname",
+        "value": "id"
+      },
+      "dicData": [],
+      "filterable":true,
       "rules": [
         {
           "required": true,
-          "message": "请输入",
+          "message": "请选择",
           "trigger": "blur"
         }
       ],
       "width": 100
-    },
-    {
-      "index": 13,
-      "prop": "unit",
-      "label": "*出库单位",
+    },{
+      "index": 11,
+      "prop": "containerNo",
+      "label": "箱号",
+      "overHidden": true,
+      "width": 100
+    },{
+      "index": 12,
+      "prop": "itemType",
+      "label": "*品牌",
       "overHidden": true,
-      "type": "select",
-      "props": {
-        "label": "dictValue",
-        "value": "dictKey"
-      },
-      "dicData": [],
       "rules": [
         {
           "required": true,
-          "message": "请选择",
+          "message": "请输入",
           "trigger": "blur"
         }
       ],
       "width": 100
-    },
-    {
+    },{
+      "index": 13,
+      "prop": "itemProp",
+      "label": "产地",
+      "overHidden": true,
+      "width": 100
+    },{
       "index": 14,
-      "prop": "price",
-      "label": "*出库单价",
+      "prop": "sliceNumber",
+      "label": "*片数",
       "overHidden": true,
+      "type":"number",
+      "controls":false,
+      "precision":0,
       "rules": [
         {
           "required": true,
@@ -205,22 +208,22 @@
         }
       ],
       "width": 100
-    },
-    {
+    },{
       "index": 15,
-      "prop": "storageAmount",
-      "label": "出库金额",
+      "prop": "forklift",
+      "label": "叉车工",
       "overHidden": true,
+      "cell": true,
       "width": 100
     },
     {
       "index": 16,
-      "prop": "itemProp",
-      "label": "产地",
+      "prop": "carry",
+      "label": "搬运工",
       "overHidden": true,
+      "cell": true,
       "width": 100
-    },
-    {
+    },{
       "index": 17,
       "prop": "surplusLoss",
       "label": "盈亏量",
@@ -228,7 +231,7 @@
       "width": 100
     },
     {
-      "index": 23,
+      "index": 18,
       "prop": "isIssue",
       "label": "库存状态",
       "overHidden": true,
@@ -267,24 +270,9 @@
         }
       ],
       "width": 100
-    },{
-      "index": 24,
-      "prop": "forklift",
-      "label": "叉车工",
-      "overHidden": true,
-      "cell": true,
-      "width": 100
-    },
-    {
-      "index": 25,
-      "prop": "carry",
-      "label": "搬运工",
-      "overHidden": true,
-      "cell": true,
-      "width": 100
     },
     {
-      "index": 26,
+      "index": 19,
       "prop": "remarks",
       "label": "备注",
       "overHidden": true,

+ 26 - 13
src/views/salesManagement/outStock/detailsPage.vue

@@ -229,6 +229,18 @@ export default {
             label: "车船号",
             prop: "vehicleShipNumber",
             span: 6
+          },{
+            label: "审核状态",
+            prop: "status",
+            type: "select",
+            dataType: 'number',
+            props: {
+              label: "dictValue",
+              value: "dictKey"
+            },
+            dicData: [],
+            disabled: true,
+            span: 6
           },
           {
             label: "供应商",
@@ -240,26 +252,28 @@ export default {
             prop: "sysNo",
             disabled: true,
             span: 6
-          },
-          {
-            label: "审核状态",
-            prop: "status",
+          },{
+            label: "是否融资",
+            prop: "arrival",
             type: "select",
             dataType: 'number',
-            props: {
-              label: "dictValue",
-              value: "dictKey"
-            },
-            dicData: [],
-            disabled: true,
+            dicData: [
+              {
+                label: "是",
+                value: 1
+              }, {
+                label: "否",
+                value: 0
+              }
+            ],
             span: 6
           },
           {
             label: "备注",
             prop: "orderRemark",
             type: "textarea",
-            minRows: 2,
-            span: 18
+            minRows: 1,
+            span: 12
           },
         ]
       },
@@ -301,7 +315,6 @@ export default {
     }
   },
   async created() {
-    console.log(this.detailData.status)
     if (this.detailData.status == 3) {
       this.option.disabled = true;
     }