修改bug

src/views/InventoryManagement/inventory/config/customerContact.json

@@ -121,8 +121,12 @@
           "value": "2"
         },
         {
-          "label": "已出库",
+          "label": "待扫描",
           "value": "3"
+        },
+        {
+          "label": "已出库",
+          "value": "4"
         }
       ],
       "width": 100

src/views/InventoryManagement/inventory/index.vue

@@ -11,7 +11,7 @@
                     </el-button>
                 </template>
                 <template slot-scope="{ row,index}" slot="menu">
-                    <el-button type="text" icon="el-icon-delete" size="small" @click.stop="rowDel(row, index)">删除
+                    <el-button type="text" icon="el-icon-delete" size="small" :disabled="row.status>0" @click.stop="rowDel(row, index)">删除
                     </el-button>
                 </template>
                 <template slot-scope="{ row,index}" slot="purchaserId">

src/views/basicData/agreement/detailsPage.vue

@@ -10,7 +10,7 @@
         <div class="add-customer-btn">
           <el-button type="info" @click="getData" size="small">刷新资料
           </el-button>
-          <el-button type="primary" size="small" @click="editCustomer" :disabled="loadingBtn || detailData.status == 1">
+          <el-button type="primary" size="small" @click="editCustomer" :disabled="form.status==0">
             保存数据
           </el-button>
         </div>
@@ -20,7 +20,7 @@
         <avue-form ref="form" class="trading-form" v-model="form" :option="option">
           <template slot="corpId">
             <crop-select ref="corpId" v-model="form.corpId" corpType="KH" :refresh="false" @getCorpData="getCorpData"
-              :disabled="detailData.status == 1"></crop-select>
+            :disabled="form.status==0"></crop-select>
           </template>
           <template slot-scope="{column}" slot="corpIdLabel">
             <span style="color: #409EFF;cursor: pointer" @click.stop="addData(column.prop)">{{column.label}}</span>
@@ -54,9 +54,9 @@
             <span v-else>{{ row.feeName }}</span>
           </template>
           <template slot="menu" slot-scope="{ row, index }">
-            <el-button size="small" type="text" @click="rowCell(row, index)" :disabled="detailData.status == 1">{{
+            <el-button size="small" type="text" @click="rowCell(row, index)" :disabled="form.status==0">{{
             row.$cellEdit ? "保存" : "修改" }}</el-button>
-            <el-button size="small" type="text" @click="rowDel(row, index)" :disabled="detailData.status == 1">删除
+            <el-button size="small" type="text" @click="rowDel(row, index)" :disabled="form.status==0">删除
             </el-button>
           </template>
         </avue-crud>
@@ -143,6 +143,13 @@ export default {
             type: "date",
             format: "yyyy-MM-dd",
             valueFormat: "yyyy-MM-dd",
+            rules: [
+              {
+                required: true,
+                message: "",
+                trigger: "blur"
+              }
+            ],
             span: 6,
           },
           {
@@ -151,6 +158,13 @@ export default {
             type: "date",
             format: "yyyy-MM-dd",
             valueFormat: "yyyy-MM-dd",
+            rules: [
+              {
+                required: true,
+                message: "",
+                trigger: "blur"
+              }
+            ],
             span: 6,
           },
           {
@@ -164,6 +178,13 @@ export default {
             },
             dicData: [],
             multiple: true,
+            rules: [
+              {
+                required: true,
+                message: "",
+                trigger: "blur"
+              }
+            ],
             span: 6,
           },
           {
@@ -177,6 +198,13 @@ export default {
               value: 'id'
             },
             multiple: true,
+            rules: [
+              {
+                required: true,
+                message: "",
+                trigger: "blur"
+              }
+            ],
             span: 6,
           },
           {
@@ -307,6 +335,9 @@ export default {
           //   res.data.data.warehouseId = res.data.data.warehouseId.split(',')
           // }
           this.form = res.data.data;
+          if(res.data.data.status==0){
+            this.option.disabled=true
+          }
           this.dataList = res.data.data.agreementitemsList;
           this.orderFilesList = res.data.data.orderFilesList
         })

src/views/basicData/agreement/index.vue

@@ -23,7 +23,7 @@
           <crop-select v-model="search.corpId" corpType="KH" :refresh="false"></crop-select>
         </template>
         <template slot-scope="{ row, index }" slot="menu">
-          <el-button type="text" size="small" @click.stop="rowDel(row, index)">
+          <el-button type="text" size="small" :disabled="row.status==0" @click.stop="rowDel(row, index)">
             删除
           </el-button>
         </template>

src/views/exportTrade/customerInquiry/detailsPage.vue

@@ -1777,6 +1777,9 @@ export default {
             costSum,
             paySum
           );
+          this.data.forEach((e, index) => {
+            e.sort = Number(index) + 1
+          })
           this.subLoading = true;
 
           submit({

src/views/exportTrade/invoice/detailsPage.vue

@@ -814,6 +814,9 @@ export default {
               return this.$message.error(`请正确输入第${i + 1}行的数量`);
             }
           }
+          this.data.forEach((e, index) => {
+            e.sort = Number(index) + 1
+          })
           const orderFilesList = this.$refs.uploadFile.submitData();
           if (status == "submit") {
             this.subLoading = true;

src/views/exportTrade/purchaseContract/detailsPage.vue

@@ -957,6 +957,9 @@ export default {
               return this.$message.error(`请正确输入第${i + 1}行的数量`);
             }
           }
+          this.data.forEach((e, index) => {
+            e.sort = Number(index) + 1
+          })
           this.subLoading = true;
           submit({
             ...this.form,

src/views/exportTrade/purchaseInquiry/detailsPage.vue

@@ -3,301 +3,139 @@
     <div class="customer-head">
       <div class="customer-back">
         <!--        <i class="back-icon el-icon-arrow-left"></i><i style="font-style:normal">返回管理列表</i>-->
-        <el-button
-          type="danger"
-          style="border: none;background: none;color: red"
-          icon="el-icon-arrow-left"
-          @click="backToList"
-          >返回列表
+        <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 "
-          :disabled="form.ifEnquiry == '询价确认'"
-          @click.stop="openEdit"
-          >编辑
+        <el-button type="primary" size="small" v-if="detailData.status == 1" class="el-button--small-yh "
+          :disabled="form.ifEnquiry == '询价确认'" @click.stop="openEdit">编辑
         </el-button>
-        <el-button
-          type="primary"
-          :disabled="form.ifEnquiry == '询价确认'"
-          v-if="detailData.status != 1"
-          @click="editCustomer('submit')"
-          size="small"
-          >提交
+        <el-button type="primary" :disabled="form.ifEnquiry == '询价确认'" v-if="detailData.status != 1"
+          @click="editCustomer('submit')" size="small">提交
         </el-button>
-        <el-button
-          type="success"
-          :disabled="!form.id"
-          size="small"
-          @click="copyDoc"
-          >复制单据</el-button
-        >
-        <el-button
-          type="primary"
-          :disabled="form.ifEnquiry == '询价确认'"
-          @click="editCustomer('save')"
-          :loading="subLoading"
-          v-if="detailData.status != 1"
-          size="small"
-          >保存数据
+        <el-button type="success" :disabled="!form.id" size="small" @click="copyDoc">复制单据</el-button>
+        <el-button type="primary" :disabled="form.ifEnquiry == '询价确认'" @click="editCustomer('save')"
+          :loading="subLoading" v-if="detailData.status != 1" size="small">保存数据
         </el-button>
       </div>
     </div>
     <div class="customer-main">
       <trade-card title="基础信息">
-        <avue-form
-          ref="form"
-          class="trading-form"
-          v-model="form"
-          :option="option"
-        >
+        <avue-form ref="form" class="trading-form" v-model="form" :option="option">
           <template slot="corpId">
-            <crop-select
-              v-model="form.corpId"
-              corpType="KH"
-              :disabled="detailData.status == 1 || form.ifEnquiry == '询价确认'"
-            ></crop-select>
+            <crop-select v-model="form.corpId" corpType="KH"
+              :disabled="detailData.status == 1 || form.ifEnquiry == '询价确认'"></crop-select>
           </template>
           <template slot="dateValidity">
-            <el-date-picker
-              format="yyyy-MM-dd"
-              value-format="yyyy-MM-dd 00:00:00"
-              v-model="form.dateValidity"
-              type="date"
-              placeholder="选择日期"
-              :disabled="detailData.status == 1"
-              :picker-options="pickerOptions"
-            ></el-date-picker>
+            <el-date-picker format="yyyy-MM-dd" value-format="yyyy-MM-dd 00:00:00" v-model="form.dateValidity"
+              type="date" placeholder="选择日期" :disabled="detailData.status == 1" :picker-options="pickerOptions">
+            </el-date-picker>
           </template>
         </avue-form>
       </trade-card>
       <trade-card title="商品信息">
-        <avue-crud
-          ref="crud"
-          :data="data"
-          :option="tableOption"
-          @row-del="rowDel"
-          @saveColumn="saveColumn"
-          @resetColumn="resetColumn"
-          :summary-method="summaryMethod"
-          :cell-style="cellStyle"
-        >
+        <avue-crud ref="crud" :data="data" :option="tableOption" @row-del="rowDel" @saveColumn="saveColumn"
+          @resetColumn="resetColumn" :summary-method="summaryMethod" :cell-style="cellStyle">
           <template slot="cname" slot-scope="{ row, index }">
             <span v-if="row.$cellEdit" style="display:flex">
-              <el-select
-                v-model="row.cname"
-                placeholder="请选择"
-                size="small"
-                style="width:60%"
-                @change="cnameChange(row, index)"
-              >
-                <el-option
-                  v-for="item in goodsoptions"
-                  :key="item.id"
-                  :label="item.cname"
-                  :value="item.cname"
-                >
+              <el-select v-model="row.cname" placeholder="请选择" size="small" style="width:60%"
+                @change="cnameChange(row, index)">
+                <el-option v-for="item in goodsoptions" :key="item.id" :label="item.cname" :value="item.cname">
                 </el-option>
               </el-select>
-              <el-button
-                icon="el-icon-search"
-                size="mini"
-                @click="rePick(row, index)"
-              ></el-button>
+              <el-button icon="el-icon-search" size="mini" @click="rePick(row, index)"></el-button>
             </span>
 
             <span v-else> {{ row.cname }}</span>
           </template>
           <template slot="price" slot-scope="{ row }">
-            <el-input
-              v-if="row.$cellEdit"
-              v-model="row.price"
-              size="small"
+            <el-input v-if="row.$cellEdit" v-model="row.price" size="small"
               oninput="value=value.replace(/[^0-9.]/g,'').replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')"
-              @change="priceChange(row)"
-            ></el-input>
+              @change="priceChange(row)"></el-input>
             <span v-else>{{ row.price }}</span>
           </template>
           <template slot="taxRate" slot-scope="{ row }">
-            <el-input
-              v-if="row.$cellEdit"
-              v-model="row.taxRate"
-              size="small"
+            <el-input v-if="row.$cellEdit" v-model="row.taxRate" size="small"
               oninput="value=value.replace(/[^0-9.]/g,'').replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')"
-              @change="priceChange(row)"
-            ></el-input>
+              @change="priceChange(row)"></el-input>
             <span v-else>{{ row.taxRate ? row.taxRate : 0 }}%</span>
           </template>
           <template slot="coefficient" slot-scope="{ row }">
-            <el-input
-              v-if="row.$cellEdit"
-              v-model="row.coefficient"
-              size="small"
+            <el-input v-if="row.$cellEdit" v-model="row.coefficient" size="small"
               oninput="value=value.replace(/[^0-9.]/g,'').replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')"
-              @change="priceChange(row)"
-            ></el-input>
+              @change="priceChange(row)"></el-input>
             <span v-else>{{ row.coefficient ? row.coefficient : 0 }}%</span>
           </template>
           <template slot="orderQuantity" slot-scope="{ row }">
-            <el-input
-              v-if="row.$cellEdit"
-              v-model="row.orderQuantity"
-              size="small"
-              oninput='this.value=this.value.replace(/[^(\d)]/g,"")'
-              @change="quantityChange(row)"
-            ></el-input>
+            <el-input v-if="row.$cellEdit" v-model="row.orderQuantity" size="small"
+              oninput='this.value=this.value.replace(/[^(\d)]/g,"")' @change="quantityChange(row)"></el-input>
             <span v-else>{{ row.orderQuantity | IntegerFormat }}</span>
           </template>
           <template slot="itemType" slot-scope="{ row }">
-            <el-select
-              v-if="row.$cellEdit"
-              v-model="row.itemType"
-              filterable
-              allow-create
-              default-first-option
-              placeholder="请输入"
-              size="small"
-              @focus="itemTypeFocus(row)"
-            >
-              <el-option
-                v-for="(item, index) in itemtypeList"
-                :key="index"
-                :label="item.value"
-                :value="item.value"
-              >
+            <el-select v-if="row.$cellEdit" v-model="row.itemType" filterable allow-create default-first-option
+              placeholder="请输入" size="small" @focus="itemTypeFocus(row)">
+              <el-option v-for="(item, index) in itemtypeList" :key="index" :label="item.value" :value="item.value">
               </el-option>
             </el-select>
             <span v-else>{{ row.itemType }}</span>
           </template>
           <template slot="priorityReferrer" slot-scope="{ row }">
-            <el-checkbox
-              :disabled="!row.$cellEdit"
-              v-model="row.priorityReferrer"
-              :true-label="1"
-              :false-label="0"
-            />
+            <el-checkbox :disabled="!row.$cellEdit" v-model="row.priorityReferrer" :true-label="1" :false-label="0" />
           </template>
           <template slot="corpId" slot-scope="{ row, index }">
-            <crop-select
-              v-show="row.$cellEdit"
-              v-model="row.corpId"
-              :cropIndex="index"
-              @getCorpData="rowCorpData"
-              gysType="CK"
-              corpType="GYS"
-            ></crop-select>
+            <crop-select v-show="row.$cellEdit" v-model="row.corpId" :cropIndex="index" @getCorpData="rowCorpData"
+              gysType="CK" corpType="GYS"></crop-select>
             <span v-show="!row.$cellEdit">{{ row.corpName }}</span>
           </template>
           <template slot="purchaseAmount" slot-scope="{ row }">
             <span>{{ row.purchaseAmount | micrometerFormat }}</span>
           </template>
           <template slot="menuLeft">
-            <el-button
-              type="primary"
-              icon="el-icon-plus"
-              size="small"
-              @click.stop="newDetails"
-              :disabled="detailData.status == 1 || form.ifEnquiry == '询价确认'"
-              >录入明细</el-button
-            >
-            <el-button
-              type="info"
-              icon="el-icon-printer"
-              size="small"
-              @click.stop="openReport()"
-              >报表打印</el-button
-            >
+            <el-button type="primary" icon="el-icon-plus" size="small" @click.stop="newDetails"
+              :disabled="detailData.status == 1 || form.ifEnquiry == '询价确认'">录入明细</el-button>
+            <el-button type="info" icon="el-icon-printer" size="small" @click.stop="openReport()">报表打印</el-button>
           </template>
           <template slot="menu" slot-scope="{ row, index }">
-            <el-button
-              size="small"
-              icon="el-icon-edit"
-              type="text"
-              @click="rowCell(row, index)"
-              :disabled="detailData.status == 1 || form.ifEnquiry == '询价确认'"
-              >{{ row.$cellEdit ? "保存" : "修改" }}</el-button
-            >
-            <el-button
-              size="small"
-              icon="el-icon-edit"
-              type="text"
-              @click="rowDel(row)"
-              :disabled="detailData.status == 1 || form.ifEnquiry == '询价确认'"
-              >删 除</el-button
-            >
+            <el-button size="small" icon="el-icon-edit" type="text" @click="rowCell(row, index)"
+              :disabled="detailData.status == 1 || form.ifEnquiry == '询价确认'">{{ row.$cellEdit ? "保存" : "修改" }}
+            </el-button>
+            <el-button size="small" icon="el-icon-edit" type="text" @click="rowDel(row)"
+              :disabled="detailData.status == 1 || form.ifEnquiry == '询价确认'">删 除</el-button>
           </template>
         </avue-crud>
       </trade-card>
     </div>
-    <el-dialog
-      title="导入商品"
-      append-to-body
-      class="el-dialogDeep"
-      :visible.sync="dialogVisible"
-      width="80%"
-      :close-on-click-modal="false"
-      :destroy-on-close="true"
-      :close-on-press-escape="false"
-      @close="closeGoods"
-      top="5vh"
-      v-dialog-drag
-    >
+    <el-dialog title="导入商品" append-to-body class="el-dialogDeep" :visible.sync="dialogVisible" width="80%"
+      :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" @close="closeGoods"
+      top="5vh" v-dialog-drag>
       <span>
         <el-row>
           <el-col :span="4">
             <div>
               <el-scrollbar>
                 <basic-container>
-                  <avue-tree
-                    :option="treeOption"
-                    @node-click="nodeClick"
-                    :style="treeStyle"
-                  />
+                  <avue-tree :option="treeOption" @node-click="nodeClick" :style="treeStyle" />
                 </basic-container>
               </el-scrollbar>
             </div>
           </el-col>
           <el-col :span="20">
-            <avue-crud
-              :option="goodsOption"
-              :table-loading="loading"
-              :data="goodsList"
-              ref="goodsCrud"
-              :search.sync="search"
-              @search-change="searchChange"
-              @refresh-change="refreshChange"
-              @selection-change="selectionChange"
-              @row-click="rowClick"
-              :page.sync="page"
-              @on-load="onLoad"
-              @saveColumn="saveGoodsColumn"
-              @resetColumn="resetGoodsColumn"
-              :cell-style="cellStyle"
-            ></avue-crud>
+            <avue-crud :option="goodsOption" :table-loading="loading" :data="goodsList" ref="goodsCrud"
+              :search.sync="search" @search-change="searchChange" @refresh-change="refreshChange"
+              @selection-change="selectionChange" @row-click="rowClick" :page.sync="page" @on-load="onLoad"
+              @saveColumn="saveGoodsColumn" @resetColumn="resetGoodsColumn" :cell-style="cellStyle"></avue-crud>
           </el-col>
         </el-row>
       </span>
 
       <span slot="footer" class="dialog-footer">
         <el-button @click="dialogVisible = false">取 消</el-button>
-        <el-button
-          type="primary"
-          @click="importGoods"
-          :disabled="selectionList.length == 0"
-          >导入</el-button
-        >
+        <el-button type="primary" @click="importGoods" :disabled="selectionList.length == 0">导入</el-button>
       </span>
     </el-dialog>
-    <report-dialog
-      :switchDialog="switchDialog"
-      :reportId="form.id"
-      reportName="客户询价"
-      @onClose="onClose()"
-    ></report-dialog>
+    <report-dialog :switchDialog="switchDialog" :reportId="form.id" reportName="客户询价" @onClose="onClose()">
+    </report-dialog>
   </div>
 </template>
 
@@ -441,7 +279,7 @@ export default {
       treeOption: {
         nodeKey: "id",
         lazy: true,
-        treeLoad: function(node, resolve) {
+        treeLoad: function (node, resolve) {
           const parentId = node.level === 0 ? 0 : node.data.id;
           getDeptLazyTree(parentId).then(res => {
             resolve(
@@ -827,7 +665,9 @@ export default {
               }
             }
           }
-
+          this.data.forEach((e, index) => {
+            e.sort = Number(index) + 1
+          })
           if (status == "save") {
             this.subLoading = true;
             submit({
@@ -1053,9 +893,11 @@ export default {
 .trading-form ::v-deep .el-form-item {
   margin-bottom: 8px !important;
 }
+
 ::v-deep .el-form-item__error {
   display: none !important;
 }
+
 ::v-deep .select-component {
   display: flex !important;
 }

src/views/exportTrade/receipt/detailsPage.vue

@@ -807,6 +807,9 @@ export default {
               return this.$message.error(`请正确输入第${i + 1}行的数量`);
             }
           }
+          this.data.forEach((e, index) => {
+            e.sort = Number(index) + 1
+          })
           if (status == "submit") {
             this.subLoading = true;
             submit({

src/views/exportTrade/salesContract/detailsPage.vue

@@ -1852,6 +1852,9 @@ export default {
             costSum,
             paySum
           );
+          this.data.forEach((e, index) => {
+            e.sort = Number(index) + 1
+          })
           this.subLoading = true;
           submit({
             ...this.form,

src/views/financialManagement/paymentSettle/paymentSettleDetailsPage.vue

@@ -569,7 +569,11 @@
         done(row);
       },
       rowCell(row,index){
-        this.$refs.crud.rowCell(row, index)
+        if (row.$cellEdit == true) {
+        this.$set(row, "$cellEdit", false);
+      } else {
+        this.$set(row, "$cellEdit", true);
+      }
         // row.$cellEdit = !row.$cellEdit
       },
       rowDel(row,index){

src/views/financialManagement/receiptSettle/receiptSettleDetailsPage.vue

@@ -589,8 +589,13 @@
         done(row);
       },
       rowCell(row,index){
-        row.$cellEdit = !row.$cellEdit
+        // row.$cellEdit = !row.$cellEdit
         // this.$refs.crud.rowCell(row, index)
+        if (row.$cellEdit == true) {
+        this.$set(row, "$cellEdit", false);
+      } else {
+        this.$set(row, "$cellEdit", true);
+      }
       },
       rowDel(row,index){
         if (row.id) {

src/views/financing/financingLedger/js/optionList2.js

@@ -10,7 +10,7 @@ export const option ={
   viewBtn: false,
   editBtn: false,
   delBtn: false,
-  menuWidth: 70,
+  menuWidth: 90,
   searchIcon: true,
   searchIndex: 2,
   column: [

src/views/financing/financingManagement/detailsPage.vue

@@ -11,7 +11,7 @@
           class="el-button--small-yh " @click.stop="openEdit">编辑
         </el-button>
         <el-button type="primary" @click="editCustomer" :loading="subLoading" v-if="detailData.status != 1"
-          size="small">{{ form.id ? '修改数据' : '保存数据' }}
+          size="small">保存数据
         </el-button>
         <el-dropdown style="padding: 0 6px;line-height: 0">
           <el-button type="primary" size="small" :loading="subLoading" :disabled="!form.id">

src/views/purchasingManagement/inStock/config/customerContact.json

@@ -305,8 +305,12 @@
           "value": "2"
         },
         {
-          "label": "已出库",
+          "label": "待扫描",
           "value": "3"
+        },
+        {
+          "label": "已出库",
+          "value": "4"
         }
       ],
       "width": 100

src/views/purchasingManagement/inStock/detailsPage.vue

@@ -167,6 +167,7 @@ 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 check from "@/components/check/check";
 export default {
   name: "detailsPageEdit",
@@ -491,8 +492,32 @@ export default {
         done();
         if (valid) {
           for (let i = 0; i < this.itemsVOList.length; i++) {
-            if (this.itemsVOList[i].$cellEdit) {
-              return this.$message.error('请保存明细')
+            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].itemType)){
+              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].sliceNumber)){
+              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].price)){
+              return this.$message.error('请完善第'+(i+1)+'行的入库单价')
             }
           }
           this.itemsVOList.forEach((e, index) => {

src/views/salesManagement/outStock/config/customerContact.json

@@ -260,8 +260,12 @@
           "value": "2"
         },
         {
-          "label": "已出库",
+          "label": "待扫描",
           "value": "3"
+        },
+        {
+          "label": "已出库",
+          "value": "4"
         }
       ],
       "width": 100

src/views/salesManagement/outStock/detailsPage.vue

@@ -155,6 +155,7 @@ import uploadFile from "@/components/upload-file/main";
 import { getToken } from "@/util/auth";
 import { contrastObj, contrastList, contrastList2 } from "@/util/contrastData";
 import { getCurrentDate } from "@/util/date";
+import {validatenull } from '@/util/validate'
 import check from "@/components/check/check";
 export default {
   name: "detailsPageEdit",
@@ -477,8 +478,32 @@ export default {
         done();
         if (valid) {
           for (let i = 0; i < this.itemsVOList.length; i++) {
-            if (this.itemsVOList[i].$cellEdit) {
-              return this.$message.error('请保存明细')
+            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].itemType)){
+              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].sliceNumber)){
+              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].price)){
+              return this.$message.error('请完善第'+(i+1)+'行的入库单价')
             }
           }
           this.itemsVOList.forEach((e, index) => {
@@ -555,7 +580,7 @@ export default {
                 })
               })
             } else {
-              this.$confirm("此订单余额不足，是否继续确认提交审核?", {
+              this.$confirm(res.data.data, {
                 confirmButtonText: "确定",
                 cancelButtonText: "取消",
                 type: "warning"
@@ -612,7 +637,7 @@ export default {
               this.getDetail(this.form.id)
             })
           } else {
-            this.$confirm("此订单余额不足，是否继续确认提交审核?", {
+            this.$confirm(res.data.data, {
               confirmButtonText: "确定",
               cancelButtonText: "取消",
               type: "warning"