吉永保存数据

src/components/boxCost/index.vue

@@ -30,6 +30,7 @@
         </el-button>
       </template>
       <template slot="menuLeft">
+          <el-button type="primary" size="small" @click="rowaddfun">录入明细</el-button>
         <el-button
             class="el-icon-download"
             type="info"
@@ -109,7 +110,7 @@ export default {
         height: 500,
         addBtnText: "录入明细",
         refreshBtn: false,
-        addBtn: true,
+        addBtn: false,
         selection: true,
         span: 6,
           searchMenuSpan: 18,
@@ -291,7 +292,7 @@ export default {
         height: 500,
         addBtnText: "录入明细",
         refreshBtn: false,
-        addBtn: true,
+        addBtn: false,
         span: 6,
           searchMenuSpan: 18,
         dialogTop: "25%",
@@ -472,7 +473,7 @@ export default {
         height: 500,
         addBtnText: "录入明细",
         refreshBtn: false,
-        addBtn: true,
+        addBtn: false,
         span: 6,
           searchMenuSpan: 18,
         dialogTop: "25%",
@@ -1008,6 +1009,15 @@ export default {
           this.page.total = this.twototal
       }
     },
+      // 费用信息添加
+      rowaddfun(){
+          if (!this.id) {
+              return this.$message.warning('请先填写保存数据');
+          }else {
+              this.$refs.crud.rowAdd()
+          }
+
+      },
       // 新增按钮事件
     rowSave(form, done, loading) {
       done({
@@ -1046,6 +1056,7 @@ export default {
           }).then(res=>{
               if (res.data.code == 200) {
                   this.$message.success("操作成功!");
+                  this.$parent.baocunindex = 1
                   this.tradingBoxFeesListfun(feesType)
               }
 
@@ -1066,6 +1077,8 @@ export default {
           }).then(res=>{
               if (res.data.code == 200) {
                   this.$message.success("操作成功!");
+                  // this.baocunindex = 1
+                  this.$parent.baocunindex = 1
                   this.transportItemFeesListdatafun(feesType)
               }
           })

src/views/boxManagement/buyContainer/detailsPage.vue

@@ -76,6 +76,7 @@
         <!--                       @getCorpData="(row)=>{getGSData(row,['formTwo','boxMakingCompany'])}" corpType="GS"/>-->
         <!--        </template>-->
         <template slot="menuLeft" slot-scope="scope">
+            <el-button type="primary" size="small" @click="rowaddfun">录入明细</el-button>
           <el-button :disabled="option.disabled" type="success" size="small" icon="el-icon-bottom" @click="importBox">
             导入
           </el-button>
@@ -343,11 +344,12 @@ export default {
       optionBack: {
         align: 'center',
         index: true,
+
         addBtnText: "录入明细",
         refreshBtn: false,
         dialogDrag: true,
         selection: true,
-        addBtn: true,
+        addBtn: false,
         span: 8,
           searchMenuSpan: 18,
         addRowBtn: false,
@@ -658,7 +660,9 @@ export default {
       tradingBoxFilesList: [],
       selectionList: [],
       disabled: false,
-      costData: {}
+      costData: {},
+        // 保存数据的次数
+        baocunindex:0
     }
   },
   async created() {
@@ -739,6 +743,7 @@ export default {
       this.dataList = this.dataList.concat(res.tradingBoxItemList)
       this.dataListTwo = this.dataListTwo.concat(res.tradingBoxFeesList)
       this.$message.success("导入成功！");
+        this.baocunindex = 1
       loading = false;
       done();
     },
@@ -764,11 +769,11 @@ export default {
         this.$set(this.optionForm, "disabled", false)
         //箱信息
         this.$set(this.option, "disabled", false)
-        this.$set(this.option, "addBtn", true)
+        // this.$set(this.option, "addBtn", true)
         this.$set(this.option, "menu", true)
         //费用信息
         this.$set(this.$refs.boxCost.option,"disabled",false)
-        this.$set(this.$refs.boxCost.option,"addBtn",true)
+        // this.$set(this.$refs.boxCost.option,"addBtn",true)
         this.$set(this.$refs.boxCost.option,"menu",true)
         //附件和顶部按钮
         this.disabled = false
@@ -975,11 +980,11 @@ export default {
             this.$set(this.optionForm, "disabled", false)
             //箱信息
             this.$set(this.option, "disabled", false)
-            this.$set(this.option, "addBtn", true)
+            // this.$set(this.option, "addBtn", true)
             this.$set(this.option, "menu", true)
             //费用信息
             this.$set(this.$refs.boxCost.option, "disabled", false)
-            this.$set(this.$refs.boxCost.option, "addBtn", true)
+            // this.$set(this.$refs.boxCost.option, "addBtn", true)
             this.$set(this.$refs.boxCost.option, "menu", true)
             //附件和顶部按钮
             this.disabled = false
@@ -1046,6 +1051,7 @@ export default {
             } else {
               this.$message.success("新增成功")
             }
+            this.baocunindex = 0
             loading.close();
             this.refresh(res.data.data.id)
           }).catch(()=>{
@@ -1054,8 +1060,25 @@ export default {
         }
       });
     },
+      // 箱信息添加
+      rowaddfun(){
+          this.$refs["form"].validate((valid,done) => {
+            if (valid) {
+                const idp = this.form.id?this.form.id:this.onLoad.id
+                if (!idp) {
+                    return this.$message.warning('请先填写保存数据');
+                }else {
+                    this.$refs.crud.rowAdd()
+                }
+            }else {
+                return this.$message.warning('请先填写基础信息');
+            }
+          })
+
+      },
       // 箱信息的添加
     rowSave(form,done,loading) {
+
       let result = this.dataList.some((item) => {
         if (item.code == form.code) {
           return true
@@ -1129,6 +1152,7 @@ export default {
               pid:this.form.id?this.form.id:this.onLoad.id
           }).then(res=>{
               this.$message.success("操作成功!");
+              this.baocunindex = 1
               this.xiangpage(this.page)
           })
       },
@@ -1203,6 +1227,7 @@ export default {
             });
             generateStack(data).then(res => {
               this.$message.success("生成堆存成功")
+                this.baocunindex = 1
               this.dialogVisible = false
               this.disabledVisible = false
               this.formState = {}
@@ -1221,6 +1246,10 @@ export default {
     },
     backToList(type) {
       if (type == 0) {
+          console.log(this.baocunindex,1246)
+          if (this.baocunindex != 0) {
+              return this.$message.warning('请先填写保存数据');
+          }
         if (this.detailData.id) {
           this.$router.push({
             path: '/boxManagement/buyContainer/index'
@@ -1271,11 +1300,11 @@ export default {
           this.$set(this.optionForm, "disabled", false)
           //箱信息
           this.$set(this.option, "disabled", false)
-          this.$set(this.option, "addBtn", true)
+          // this.$set(this.option, "addBtn", true)
           this.$set(this.option, "menu", true)
           //费用信息
           this.$set(this.$refs.boxCost.option, "disabled", false)
-          this.$set(this.$refs.boxCost.option, "addBtn", true)
+          // this.$set(this.$refs.boxCost.option, "addBtn", true)
           this.$set(this.$refs.boxCost.option, "menu", true)
           //附件和顶部按钮
           this.disabled = false
@@ -1285,11 +1314,11 @@ export default {
         this.$set(this.optionForm, "disabled", false)
         //箱信息
         this.$set(this.option, "disabled", false)
-        this.$set(this.option, "addBtn", true)
+        // this.$set(this.option, "addBtn", true)
         this.$set(this.option, "menu", true)
         //费用信息
         this.$set(this.$refs.boxCost.option, "disabled", false)
-        this.$set(this.$refs.boxCost.option, "addBtn", true)
+        // this.$set(this.$refs.boxCost.option, "addBtn", true)
         this.$set(this.$refs.boxCost.option, "menu", true)
         //附件和顶部按钮
         this.disabled = false

src/views/boxManagement/exportShipment/detailsPage.vue

@@ -85,6 +85,7 @@
           <span v-for="item in $refs.crud.DIC.status" :style="{color: item.colour}" v-if="item.dictKey == row.status">{{item.dictValue}}</span>
         </template>
         <template slot="menuLeft" slot-scope="scope">
+            <el-button type="primary" size="small" @click="rowaddfun">录入明细</el-button>
           <el-button type="success" size="small" :disabled="option.disabled" @click="importBox">提取</el-button>
           <el-button :disabled="option.disabled" type="success" size="small" icon="el-icon-bottom" @click="importBoxTwo">导入</el-button>
           <el-button class="el-icon-download" type="info" size="small" :disabled="!form.id" @click="openReport">报表打印</el-button>
@@ -659,7 +660,7 @@ export default {
         selection: true,
         addBtnText: "录入明细",
         refreshBtn: false,
-        addBtn: true,
+        addBtn: false,
         span: 8,
           searchMenuSpan: 18,
         addRowBtn: false,
@@ -840,7 +841,9 @@ export default {
       tradingBoxFilesList: [],
       selectionList: [],
       disabled: false,
-      costData: {}
+      costData: {},
+        // 保存数据的次数
+        baocunindex:0
     }
   },
   async created() {
@@ -917,11 +920,11 @@ export default {
         this.$set(this.optionForm, "disabled", false)
         //箱信息
         this.$set(this.option, "disabled", false)
-        this.$set(this.option, "addBtn", true)
+        // this.$set(this.option, "addBtn", true)
         this.$set(this.option, "menu", true)
         //费用信息
         this.$set(this.$refs.boxCost.option, "disabled", false)
-        this.$set(this.$refs.boxCost.option, "addBtn", true)
+        // this.$set(this.$refs.boxCost.option, "addBtn", true)
         this.$set(this.$refs.boxCost.option, "menu", true)
         //附件和顶部按钮
         this.disabled = false
@@ -960,6 +963,7 @@ export default {
       this.dataList = this.dataList.concat(res.transportItemList)
       this.dataListTwo = this.dataListTwo.concat(res.transportItemFeesList)
       this.$message.success("导入成功！");
+        this.baocunindex = 1
       loading = false;
       done();
     },
@@ -1009,6 +1013,9 @@ export default {
             exchangeRate: item.exchangeRate || 1,
             amount: item.amount
           })
+
+            this.transportItemSubmitfunfun(item)
+
           loading.close();
         })
       }
@@ -1038,6 +1045,7 @@ export default {
             });
             generateStack(data).then(res => {
               this.$message.success("生成堆存成功")
+                this.baocunindex = 1
               this.dialogVisible = false
               this.disabledVisible = false
               this.formState = {}
@@ -1366,11 +1374,11 @@ export default {
             this.$set(this.optionForm, "disabled", false)
             //箱信息
             this.$set(this.option, "disabled", false)
-            this.$set(this.option, "addBtn", true)
+            // this.$set(this.option, "addBtn", true)
             this.$set(this.option, "menu", true)
             //费用信息
             this.$set(this.$refs.boxCost.option, "disabled", false)
-            this.$set(this.$refs.boxCost.option, "addBtn", true)
+            // this.$set(this.$refs.boxCost.option, "addBtn", true)
             this.$set(this.$refs.boxCost.option, "menu", true)
             //附件和顶部按钮
             this.disabled = false
@@ -1434,6 +1442,7 @@ export default {
             } else {
               this.$message.success("新增成功")
             }
+              this.baocunindex = 0
             loading.close();
             this.refresh(res.data.data.id)
           }).catch(()=>{
@@ -1442,6 +1451,21 @@ export default {
         }
       });
     },
+      // 箱信息添加
+      rowaddfun(){
+          this.$refs["form"].validate((valid,done) => {
+              if (valid) {
+                  const idp = this.form.id?this.form.id:this.onLoad.id
+                  if (!idp) {
+                      return this.$message.warning('请先填写保存数据');
+                  }else {
+                      this.$refs.crud.rowAdd()
+                  }
+              }else {
+                  return this.$message.warning('请先填写基础信息');
+              }
+          })
+      },
       // 箱信息的添加
     rowSave(form, done, loading) {
       let result = this.dataList.some((item) => {
@@ -1493,6 +1517,7 @@ export default {
               pid:this.form.id,
           }).then(res=>{
               this.$message.success("操作成功!");
+              this.baocunindex = 1
               this.xiangpagefun(this.page)
           })
       },
@@ -1538,6 +1563,10 @@ export default {
     },
     backToList(type) {
       if (type == 0){
+          console.log(this.baocunindex,1246)
+          if (this.baocunindex != 0) {
+              return this.$message.warning('请先填写保存数据');
+          }
         if (this.detailData.id){
           this.$router.push({
             path: '/boxManagement/exportShipment/index'
@@ -1588,11 +1617,11 @@ export default {
           this.$set(this.optionForm, "disabled", false)
           //箱信息
           this.$set(this.option, "disabled", false)
-          this.$set(this.option, "addBtn", true)
+          // this.$set(this.option, "addBtn", true)
           this.$set(this.option, "menu", true)
           //费用信息
           this.$set(this.$refs.boxCost.option, "disabled", false)
-          this.$set(this.$refs.boxCost.option, "addBtn", true)
+          // this.$set(this.$refs.boxCost.option, "addBtn", true)
           this.$set(this.$refs.boxCost.option, "menu", true)
           //附件和顶部按钮
           this.disabled = false
@@ -1602,11 +1631,11 @@ export default {
         this.$set(this.optionForm, "disabled", false)
         //箱信息
         this.$set(this.option, "disabled", false)
-        this.$set(this.option, "addBtn", true)
+        // this.$set(this.option, "addBtn", true)
         this.$set(this.option, "menu", true)
         //费用信息
         this.$set(this.$refs.boxCost.option, "disabled", false)
-        this.$set(this.$refs.boxCost.option, "addBtn", true)
+        // this.$set(this.$refs.boxCost.option, "addBtn", true)
         this.$set(this.$refs.boxCost.option, "menu", true)
         //附件和顶部按钮
         this.disabled = false

src/views/boxManagement/importReturnTrip/detailsPage.vue

@@ -84,6 +84,7 @@
           <span v-for="item in $refs.crud.DIC.status" :style="{color: item.colour}" v-if="item.dictKey == row.status">{{item.dictValue}}</span>
         </template>
         <template slot="menuLeft" slot-scope="scope">
+            <el-button type="primary" size="small" @click="rowaddfun">录入明细</el-button>
           <el-button type="success" size="small" :disabled="option.disabled" @click="importBox">提取</el-button>
           <el-button :disabled="option.disabled" type="success" size="small" icon="el-icon-bottom" @click="importBoxTwo">导入</el-button>
           <el-button class="el-icon-download" type="info" size="small" :disabled="!form.id" @click="openReport">报表打印</el-button>
@@ -668,7 +669,7 @@ export default {
         selection: true,
         addBtnText: "录入明细",
         refreshBtn: false,
-        addBtn: true,
+        addBtn: false,
         span: 8,
           searchMenuSpan: 18,
         addRowBtn: false,
@@ -849,7 +850,9 @@ export default {
       tradingBoxFilesList: [],
       selectionList: [],
       disabled: false,
-      costData: {}
+      costData: {},
+        // 保存数据的次数
+        baocunindex:0
     }
   },
   async created() {
@@ -928,11 +931,11 @@ export default {
         this.$set(this.optionForm, "disabled", false)
         //箱信息
         this.$set(this.option, "disabled", false)
-        this.$set(this.option, "addBtn", true)
+        // this.$set(this.option, "addBtn", true)
         this.$set(this.option, "menu", true)
         //费用信息
         this.$set(this.$refs.boxCost.option, "disabled", false)
-        this.$set(this.$refs.boxCost.option, "addBtn", true)
+        // this.$set(this.$refs.boxCost.option, "addBtn", true)
         this.$set(this.$refs.boxCost.option, "menu", true)
         //附件和顶部按钮
         this.disabled = false
@@ -971,6 +974,7 @@ export default {
       this.dataList = this.dataList.concat(res.transportItemList)
       this.dataListTwo = this.dataListTwo.concat(res.transportItemFeesList)
       this.$message.success("导入成功！");
+        this.baocunindex = 1
       loading = false;
       done();
     },
@@ -1020,6 +1024,9 @@ export default {
             exchangeRate: item.exchangeRate || 1,
             amount: item.amount
           })
+
+            this.transportItemSubmitfunfun(item)
+
           loading.close();
         }).catch(()=>{
           loading.close();
@@ -1050,6 +1057,7 @@ export default {
             });
             generateStack(data).then(res => {
               this.$message.success("生成堆存成功")
+                this.baocunindex = 1
               this.dialogVisible = false
               this.disabledVisible = false
               this.formState = {}
@@ -1377,11 +1385,11 @@ export default {
             this.$set(this.optionForm, "disabled", false)
             //箱信息
             this.$set(this.option, "disabled", false)
-            this.$set(this.option, "addBtn", true)
+            // this.$set(this.option, "addBtn", true)
             this.$set(this.option, "menu", true)
             //费用信息
             this.$set(this.$refs.boxCost.option, "disabled", false)
-            this.$set(this.$refs.boxCost.option, "addBtn", true)
+            // this.$set(this.$refs.boxCost.option, "addBtn", true)
             this.$set(this.$refs.boxCost.option, "menu", true)
             //附件和顶部按钮
             this.disabled = false
@@ -1444,6 +1452,7 @@ export default {
             } else {
               this.$message.success("新增成功")
             }
+              this.baocunindex = 0
             loading.close();
             this.refresh(res.data.data.id)
           }).catch(()=>{
@@ -1452,6 +1461,21 @@ export default {
         }
       });
     },
+      // 箱信息添加
+      rowaddfun(){
+          this.$refs["form"].validate((valid,done) => {
+              if (valid) {
+                  const idp = this.form.id?this.form.id:this.onLoad.id
+                  if (!idp) {
+                      return this.$message.warning('请先填写保存数据');
+                  }else {
+                      this.$refs.crud.rowAdd()
+                  }
+              }else {
+                  return this.$message.warning('请先填写基础信息');
+              }
+          })
+      },
       // 箱信息数据
     rowSave(form, done, loading) {
       let result = this.dataList.some((item) => {
@@ -1540,6 +1564,7 @@ export default {
               pid:this.form.id,
           }).then(res=>{
               this.$message.success("操作成功!");
+              this.baocunindex = 1
               this.xiangpagefun(this.page)
           })
       },
@@ -1549,6 +1574,10 @@ export default {
     },
     backToList(type) {
       if (type == 0){
+          console.log(this.baocunindex,1246)
+          if (this.baocunindex != 0) {
+              return this.$message.warning('请先填写保存数据');
+          }
         if (this.detailData.id){
           this.$router.push({
             path: '/boxManagement/importReturnTrip/index'
@@ -1596,11 +1625,11 @@ export default {
           this.$set(this.optionForm, "disabled", false)
           //箱信息
           this.$set(this.option, "disabled", false)
-          this.$set(this.option, "addBtn", true)
+          // this.$set(this.option, "addBtn", true)
           this.$set(this.option, "menu", true)
           //费用信息
           this.$set(this.$refs.boxCost.option, "disabled", false)
-          this.$set(this.$refs.boxCost.option, "addBtn", true)
+          // this.$set(this.$refs.boxCost.option, "addBtn", true)
           this.$set(this.$refs.boxCost.option, "menu", true)
           //附件和顶部按钮
           this.disabled = false
@@ -1610,11 +1639,11 @@ export default {
         this.$set(this.optionForm, "disabled", false)
         //箱信息
         this.$set(this.option, "disabled", false)
-        this.$set(this.option, "addBtn", true)
+        // this.$set(this.option, "addBtn", true)
         this.$set(this.option, "menu", true)
         //费用信息
         this.$set(this.$refs.boxCost.option, "disabled", false)
-        this.$set(this.$refs.boxCost.option, "addBtn", true)
+        // this.$set(this.$refs.boxCost.option, "addBtn", true)
         this.$set(this.$refs.boxCost.option, "menu", true)
         //附件和顶部按钮
         this.disabled = false

src/views/boxManagement/leaseIn/detailsPage.vue

@@ -78,6 +78,7 @@
         <!--                       @getCorpData="(row)=>{getGSData(row,['formTwo','boxMakingCompany'])}" corpType="GS"/>-->
         <!--        </template>-->
         <template slot="menuLeft" slot-scope="scope">
+            <el-button type="primary" size="small" @click="rowaddfun">录入明细</el-button>
           <el-button
               :disabled="selectionList.length === 0 || option.disabled || (selectionList.findIndex(function(item){return item.status == '录入'}) == -1?true:false)"
               type="primary" size="small"
@@ -480,7 +481,7 @@ export default {
         addBtnText: "录入明细",
         refreshBtn: false,
         dialogDrag: true,
-        addBtn: true,
+        addBtn: false,
         span: 8,
         height:600,
         selection: true,
@@ -862,7 +863,9 @@ export default {
       tradingBoxFilesList: [],
       disabled: false,
       disabledVisible: false,
-      costData:{}
+      costData:{},
+        // 保存数据的次数
+        baocunindex:0
     }
   },
   async created() {
@@ -934,6 +937,7 @@ export default {
       }
       this.dataList = this.dataList.concat(res)
       this.$message.success("导入成功！");
+        this.baocunindex = 1
       loading = false;
       done();
     },
@@ -1037,6 +1041,7 @@ export default {
             });
             generateStack(data).then(res => {
               this.$message.success("生成堆存成功")
+                this.baocunindex = 1
               this.dialogVisible = false
               this.disabledVisible = false
               this.formState = {}
@@ -1127,11 +1132,11 @@ export default {
         this.$set(this.optionForm, "disabled", false)
         //箱信息
         this.$set(this.option, "disabled", false)
-        this.$set(this.option, "addBtn", true)
+        // this.$set(this.option, "addBtn", true)
         this.$set(this.option, "menu", true)
         //费用信息
         this.$set(this.$refs.boxCost.option,"disabled",false)
-        this.$set(this.$refs.boxCost.option,"addBtn",true)
+        // this.$set(this.$refs.boxCost.option,"addBtn",true)
         this.$set(this.$refs.boxCost.option,"menu",true)
         //附件和顶部按钮
         this.disabled = false
@@ -1373,11 +1378,11 @@ export default {
             this.$set(this.optionForm, "disabled", false)
             //箱信息
             this.$set(this.option, "disabled", false)
-            this.$set(this.option, "addBtn", true)
+            // this.$set(this.option, "addBtn", true)
             this.$set(this.option, "menu", true)
             //费用信息
             this.$set(this.$refs.boxCost.option, "disabled", false)
-            this.$set(this.$refs.boxCost.option, "addBtn", true)
+            // this.$set(this.$refs.boxCost.option, "addBtn", true)
             this.$set(this.$refs.boxCost.option, "menu", true)
             //附件和顶部按钮
             this.disabled = false
@@ -1410,6 +1415,7 @@ export default {
             } else {
               this.$message.success("新增成功")
             }
+              this.baocunindex = 0
             loading.close();
             this.refresh(res.data.data.id)
           }).catch(()=>{
@@ -1418,6 +1424,21 @@ export default {
         }
       });
     },
+      // 箱信息添加
+      rowaddfun(){
+          this.$refs["form"].validate((valid,done) => {
+              if (valid) {
+                  const idp = this.form.id?this.form.id:this.onLoad.id
+                  if (!idp) {
+                      return this.$message.warning('请先填写保存数据');
+                  }else {
+                      this.$refs.crud.rowAdd()
+                  }
+              }else {
+                  return this.$message.warning('请先填写基础信息');
+              }
+          })
+      },
       // 箱信息的添加
     rowSave(form,done,loading) {
       let result = this.dataList.some((item) => {
@@ -1440,13 +1461,13 @@ export default {
       done(form)
     },
       // 箱信息的添加和保存
-      // 箱信息的保存和添加
       tradingBoxItemSubmitfun(form){
           tradingBoxItemSubmit({
               ...form,
               pid:this.form.id?this.form.id:this.onLoad.id
           }).then(res=>{
               this.$message.success("操作成功!");
+              this.baocunindex = 1
               this.queryDetails()
           })
       },
@@ -1506,6 +1527,10 @@ export default {
     },
     backToList(type) {
       if (type == 0){
+          console.log(this.baocunindex,1246)
+          if (this.baocunindex != 0) {
+              return this.$message.warning('请先填写保存数据');
+          }
         if (this.detailData.id){
           this.$router.push({
             path: '/boxManagement/buyContainer/index'
@@ -1556,11 +1581,11 @@ export default {
           this.$set(this.optionForm, "disabled", false)
           //箱信息
           this.$set(this.option, "disabled", false)
-          this.$set(this.option, "addBtn", true)
+          // this.$set(this.option, "addBtn", true)
           this.$set(this.option, "menu", true)
           //费用信息
           this.$set(this.$refs.boxCost.option, "disabled", false)
-          this.$set(this.$refs.boxCost.option, "addBtn", true)
+          // this.$set(this.$refs.boxCost.option, "addBtn", true)
           this.$set(this.$refs.boxCost.option, "menu", true)
           //附件和顶部按钮
           this.disabled = false
@@ -1570,11 +1595,11 @@ export default {
         this.$set(this.optionForm, "disabled", false)
         //箱信息
         this.$set(this.option, "disabled", false)
-        this.$set(this.option, "addBtn", true)
+        // this.$set(this.option, "addBtn", true)
         this.$set(this.option, "menu", true)
         //费用信息
         this.$set(this.$refs.boxCost.option, "disabled", false)
-        this.$set(this.$refs.boxCost.option, "addBtn", true)
+        // this.$set(this.$refs.boxCost.option, "addBtn", true)
         this.$set(this.$refs.boxCost.option, "menu", true)
         //附件和顶部按钮
         this.disabled = false

src/views/boxManagement/leaseOut/detailsPage.vue

@@ -78,6 +78,7 @@
         <!--                       @getCorpData="(row)=>{getGSData(row,['formTwo','boxMakingCompany'])}" corpType="GS"/>-->
         <!--        </template>-->
         <template slot="menuLeft" slot-scope="scope">
+            <el-button type="primary" size="small" @click="rowaddfun">录入明细</el-button>
           <el-button :disabled="selectionList.length === 0 || option.disabled || (selectionList.findIndex(function(item){return item.status == '录入'}) == -1?true:false)" type="primary" size="small"
                      @click="statusUpdate('0','起租')">起租
           </el-button>
@@ -474,7 +475,7 @@ export default {
         addBtnText: "录入明细",
         refreshBtn: false,
         dialogDrag: true,
-        addBtn: true,
+        addBtn: false,
         span: 8,
         searchMenuPosition: "right",
         searchSpan: 8,
@@ -822,7 +823,9 @@ export default {
       tradingBoxFilesList: [],
       disabled: false,
       disabledVisible: false,
-      costData:{}
+      costData:{},
+        // 保存数据的次数
+        baocunindex:0
     }
   },
   async created() {
@@ -905,6 +908,7 @@ export default {
       }
       this.dataList = this.dataList.concat(res)
       this.$message.success("导入成功！");
+        this.baocunindex = 1
       loading = false;
       done();
     },
@@ -1010,6 +1014,7 @@ export default {
             });
             generateStack(data).then(res => {
               this.$message.success("生成堆存成功")
+                this.baocunindex = 1
               this.dialogVisible = false
               this.disabledVisible = false
               this.formState = {}
@@ -1100,11 +1105,11 @@ export default {
         this.$set(this.optionForm, "disabled", false)
         //箱信息
         this.$set(this.option, "disabled", false)
-        this.$set(this.option, "addBtn", true)
+        // this.$set(this.option, "addBtn", true)
         this.$set(this.option, "menu", true)
         //费用信息
         this.$set(this.$refs.boxCost.option,"disabled",false)
-        this.$set(this.$refs.boxCost.option,"addBtn",true)
+        // this.$set(this.$refs.boxCost.option,"addBtn",true)
         this.$set(this.$refs.boxCost.option,"menu",true)
         //附件和顶部按钮
         this.disabled = false
@@ -1348,11 +1353,11 @@ export default {
             this.$set(this.optionForm, "disabled", false)
             //箱信息
             this.$set(this.option, "disabled", false)
-            this.$set(this.option, "addBtn", true)
+            // this.$set(this.option, "addBtn", true)
             this.$set(this.option, "menu", true)
             //费用信息
             this.$set(this.$refs.boxCost.option, "disabled", false)
-            this.$set(this.$refs.boxCost.option, "addBtn", true)
+            // this.$set(this.$refs.boxCost.option, "addBtn", true)
             this.$set(this.$refs.boxCost.option, "menu", true)
             //附件和顶部按钮
             this.disabled = false
@@ -1385,6 +1390,7 @@ export default {
             } else {
               this.$message.success("新增成功")
             }
+              this.baocunindex = 0
             loading.close();
             this.refresh(res.data.data.id)
           }).catch(()=>{
@@ -1394,6 +1400,21 @@ export default {
       });
     },
       // 箱信息添加
+      rowaddfun(){
+          this.$refs["form"].validate((valid,done) => {
+              if (valid) {
+                  const idp = this.form.id?this.form.id:this.onLoad.id
+                  if (!idp) {
+                      return this.$message.warning('请先填写保存数据');
+                  }else {
+                      this.$refs.crud.rowAdd()
+                  }
+              }else {
+                  return this.$message.warning('请先填写基础信息');
+              }
+          })
+      },
+      // 箱信息添加
     rowSave(form,done,loading) {
       let result = this.dataList.some((item) => {
         if (item.code == form.code) {
@@ -1421,6 +1442,7 @@ export default {
               pid:this.form.id?this.form.id:this.onLoad.id
           }).then(res=>{
               this.$message.success("操作成功!");
+              this.baocunindex = 1
               this.queryDetails()
           })
       },
@@ -1476,6 +1498,10 @@ export default {
     },
     backToList(type) {
       if (type == 0){
+          console.log(this.baocunindex,1246)
+          if (this.baocunindex != 0) {
+              return this.$message.warning('请先填写保存数据');
+          }
         if (this.detailData.id){
           this.$router.push({
             path: '/boxManagement/buyContainer/index'
@@ -1526,11 +1552,11 @@ export default {
           this.$set(this.optionForm, "disabled", false)
           //箱信息
           this.$set(this.option, "disabled", false)
-          this.$set(this.option, "addBtn", true)
+          // this.$set(this.option, "addBtn", true)
           this.$set(this.option, "menu", true)
           //费用信息
           this.$set(this.$refs.boxCost.option, "disabled", false)
-          this.$set(this.$refs.boxCost.option, "addBtn", true)
+          // this.$set(this.$refs.boxCost.option, "addBtn", true)
           this.$set(this.$refs.boxCost.option, "menu", true)
           //附件和顶部按钮
           this.disabled = false
@@ -1540,11 +1566,11 @@ export default {
         this.$set(this.optionForm, "disabled", false)
         //箱信息
         this.$set(this.option, "disabled", false)
-        this.$set(this.option, "addBtn", true)
+        // this.$set(this.option, "addBtn", true)
         this.$set(this.option, "menu", true)
         //费用信息
         this.$set(this.$refs.boxCost.option, "disabled", false)
-        this.$set(this.$refs.boxCost.option, "addBtn", true)
+        // this.$set(this.$refs.boxCost.option, "addBtn", true)
         this.$set(this.$refs.boxCost.option, "menu", true)
         //附件和顶部按钮
         this.disabled = false

src/views/boxManagement/sellingContainers/detailsPage.vue

@@ -78,6 +78,7 @@
 <!--                       @getCorpData="(row)=>{getGSData(row,['formTwo','boxMakingCompany'])}" corpType="GS"/>-->
 <!--        </template>-->
         <template slot="menuLeft" slot-scope="scope">
+            <el-button type="primary" size="small" @click="rowaddfun">录入明细</el-button>
           <el-button :disabled="option.disabled" type="success" size="small" icon="el-icon-bottom" @click="importBox">
             导入
           </el-button>
@@ -349,7 +350,7 @@ export default {
         refreshBtn: false,
         dialogDrag: true,
         selection: true,
-        addBtn: true,
+        addBtn: false,
         span: 8,
           searchMenuSpan: 18,
         addRowBtn: false,
@@ -659,7 +660,9 @@ export default {
       tradingBoxFilesList: [],
       selectionList: [],
       disabled: false,
-      costData:{}
+      costData:{},
+        // 保存数据的次数
+        baocunindex:0
     }
   },
   async created() {
@@ -744,6 +747,7 @@ export default {
       this.dataList = this.dataList.concat(res.tradingBoxItemList)
       this.dataListTwo = this.dataListTwo.concat(res.tradingBoxFeesList)
       this.$message.success("导入成功！");
+        this.baocunindex = 1
       loading = false;
       done();
     },
@@ -774,11 +778,11 @@ export default {
         this.$set(this.optionForm, "disabled", false)
         //箱信息
         this.$set(this.option, "disabled", false)
-        this.$set(this.option, "addBtn", true)
+        // this.$set(this.option, "addBtn", true)
         this.$set(this.option, "menu", true)
         //费用信息
         this.$set(this.$refs.boxCost.option,"disabled",false)
-        this.$set(this.$refs.boxCost.option,"addBtn",true)
+        // this.$set(this.$refs.boxCost.option,"addBtn",true)
         this.$set(this.$refs.boxCost.option,"menu",true)
         //附件和顶部按钮
         this.disabled = false
@@ -974,11 +978,11 @@ export default {
             this.$set(this.optionForm, "disabled", false)
             //箱信息
             this.$set(this.option, "disabled", false)
-            this.$set(this.option, "addBtn", true)
+            // this.$set(this.option, "addBtn", true)
             this.$set(this.option, "menu", true)
             //费用信息
             this.$set(this.$refs.boxCost.option, "disabled", false)
-            this.$set(this.$refs.boxCost.option, "addBtn", true)
+            // this.$set(this.$refs.boxCost.option, "addBtn", true)
             this.$set(this.$refs.boxCost.option, "menu", true)
             //附件和顶部按钮
             this.disabled = false
@@ -1044,6 +1048,7 @@ export default {
             } else {
               this.$message.success("新增成功")
             }
+              this.baocunindex = 0
             loading.close();
             this.refresh(res.data.data.id)
           }).catch(()=>{
@@ -1071,6 +1076,21 @@ export default {
       }
       done();
     },
+      // 箱信息添加
+      rowaddfun(){
+          this.$refs["form"].validate((valid,done) => {
+              if (valid) {
+                  const idp = this.form.id?this.form.id:this.onLoad.id
+                  if (!idp) {
+                      return this.$message.warning('请先填写保存数据');
+                  }else {
+                      this.$refs.crud.rowAdd()
+                  }
+              }else {
+                  return this.$message.warning('请先填写基础信息');
+              }
+          })
+      },
       // 箱信息的添加
     rowSave(form,done,loading) {
       let result = this.dataList.some((item) => {
@@ -1147,6 +1167,7 @@ export default {
               pid:this.form.id?this.form.id:this.onLoad.id
           }).then(res=>{
               this.$message.success("操作成功!");
+              this.baocunindex = 1
               this.xiangpage(this.page)
           })
       },
@@ -1206,6 +1227,7 @@ export default {
             });
             generateStack(data).then(res => {
               this.$message.success("生成堆存成功")
+                this.baocunindex = 1
               this.dialogVisible = false
               this.disabledVisible = false
               this.formState = {}
@@ -1221,6 +1243,10 @@ export default {
     },
     backToList(type) {
       if (type == 0){
+          console.log(this.baocunindex,1246)
+          if (this.baocunindex != 0) {
+              return this.$message.warning('请先填写保存数据');
+          }
         if (this.detailData.id){
           this.$router.push({
             path: '/boxManagement/sellingContainers/index'
@@ -1271,11 +1297,11 @@ export default {
           this.$set(this.optionForm, "disabled", false)
           //箱信息
           this.$set(this.option, "disabled", false)
-          this.$set(this.option, "addBtn", true)
+          // this.$set(this.option, "addBtn", true)
           this.$set(this.option, "menu", true)
           //费用信息
           this.$set(this.$refs.boxCost.option, "disabled", false)
-          this.$set(this.$refs.boxCost.option, "addBtn", true)
+          // this.$set(this.$refs.boxCost.option, "addBtn", true)
           this.$set(this.$refs.boxCost.option, "menu", true)
           //附件和顶部按钮
           this.disabled = false
@@ -1285,11 +1311,11 @@ export default {
         this.$set(this.optionForm, "disabled", false)
         //箱信息
         this.$set(this.option, "disabled", false)
-        this.$set(this.option, "addBtn", true)
+        // this.$set(this.option, "addBtn", true)
         this.$set(this.option, "menu", true)
         //费用信息
         this.$set(this.$refs.boxCost.option, "disabled", false)
-        this.$set(this.$refs.boxCost.option, "addBtn", true)
+        // this.$set(this.$refs.boxCost.option, "addBtn", true)
         this.$set(this.$refs.boxCost.option, "menu", true)
         //附件和顶部按钮
         this.disabled = false

src/views/financialManagement/receiptSettle/receiptSettleDetailsPage.vue

@@ -25,7 +25,7 @@
                      :loading="buttonLoading"
                      :disabled="!form.id || editDisable"
                      v-if="form.id"
-                     @click.stop="confirmSettlement"
+                     @click.stop="confirmSettlement(financeDisabled)"
           >{{financeDisabled?"收费":"撤销收费"}}
           </el-button>
           <el-button class="el-button--small-yh"
@@ -522,7 +522,7 @@
 
         isProcurement({param:"whether.display.member"}).then(res=>{
             this.isProcurementfalse = res.data.data
-            if (this.isProcurementfalse == 1) {
+            if (this.isProcurementfalse) {
                 this.findObject(this.itemsOption.column, "memberBalance").hide = false
             }
         })
@@ -726,6 +726,7 @@
         console.log('1')
       },
       confirmSettlement(status){
+          console.log(status,729)
         if (!this.form.corpId) return this.$message.error('往来单位不能为空')
         this.$refs["form"].validate((valid,done) => {
           done();
@@ -737,7 +738,9 @@
             }).then(()=>{
               for (let i = 0; i < this.dataList.length; i++) {
                 if (this.dataList[i].thisAmount == null || this.dataList[i].thisAmount == 0 ) {
-                  return this.$message.error(`第${i + 1}行的本次金额不能为空`);
+                    if(this.dataList[i].memberBalance == null || this.dataList[i].memberBalance == 0) {
+                        return this.$message.error(`第${i + 1}行的本次金额或会员卡金额不能为空`);
+                    }
                 }
               }
 
@@ -783,7 +786,7 @@
               }
             })
             if(status === true){
-              this.$emit("goBack");
+              // this.$emit("goBack");
               this.leaveDetailsKey(this.$route.name)
             }
           }
@@ -795,7 +798,11 @@
           if(valid){
             for (let i = 0; i < this.dataList.length; i++) {
               if (this.dataList[i].thisAmount === (null || "")) {
-                return this.$message.error(`第${i + 1}行的本次金额不能为空`);
+                  if(this.dataList[i].memberBalance == null || this.dataList[i].memberBalance == 0) {
+                      return this.$message.error(`第${i + 1}行的本次金额或会员卡金额不能为空`);
+                  }
+                // return this.$message.error(`第${i + 1}行的本次金额不能为空`);
+
               }
             }
 

src/views/product/detailsPage.vue

@@ -89,6 +89,7 @@
 import { getGoodstype, getDetails, goodsTypesubmit, getStoragetype, submit, itemRemove, disabled, getStoragelist, storagesubmit } from "@/api/basicData/product";
 import { optionList } from "./js/optionList";
 import goodsType from '@/components/goodsType/index'
+import {getList} from "@/api/basicData/client";
 export default {
   name: "index",
   data() {
@@ -287,7 +288,7 @@ export default {
                 minRows: 0,
                 controls: false,
                 disabled:true,
-                span: 8,
+                span: 6,
                 value:0,
                 rules: [{
                     pattern:/^[+]{0,1}(\d+)$/,
@@ -302,7 +303,7 @@ export default {
                 minRows: 0,
                 controls: false,
                 disabled:true,
-                span: 8,
+                span: 6,
                 value:0,
                 rules: [{
                     pattern:/^[+]{0,1}(\d+)$/,
@@ -317,7 +318,7 @@ export default {
                 minRows: 0,
                 controls: false,
                 disabled:true,
-                span: 8,
+                span: 6,
                 value:0,
                 rules: [{
                     pattern:/^[+]{0,1}(\d+)$/,
@@ -332,7 +333,7 @@ export default {
                 minRows: 0,
                 controls: false,
                 disabled:true,
-                span: 8,
+                span: 6,
                 value:0,
                 rules: [{
                     pattern:/^[+]{0,1}(\d+)$/,
@@ -340,6 +341,35 @@ export default {
                     trigger:"blur"
                 }]
             },
+            {
+                label: "厂家",
+                prop: "corpId",
+                type: "select",
+                props: {
+                    label: "cname",
+                    value: "id"
+                },
+                dicData: [],
+                span: 6,
+            },
+            {
+                label: "采购日期",
+                prop: "exitDate",
+                type: "date",
+                format: "yyyy-MM-dd",
+                valueFormat: "yyyy-MM-dd 00:00:00",
+                span: 6,
+            },
+            {
+                label: "规格",
+                prop: "specs",
+                span: 6,
+            },
+            {
+                label: "品牌",
+                prop: "brand",
+                span: 6,
+            },
           {
             label: "备注",
             prop: "remarks",
@@ -458,19 +488,19 @@ export default {
       this.option.disabled = true;
     }
 
-      // 判断是否是admin 权限
-      this.roleNameqx = localStorage.getItem('roleName').split(',')
-      let arr = localStorage.getItem('roleName').split(',')
-      if (arr.indexOf('admin') != -1 && this.form.whetherIntegral == 0) {
-          this.findObject(this.option.column, "storeIntegral").disabled = false
-          this.findObject(this.option.column, "referenceIntegral").disabled = false
-          this.findObject(this.option.column, "salesmanIntegral").disabled = false
-          this.findObject(this.option.column, "integral").disabled = false
-      }
+    // 获取供应商数据
+      this.getListfun()
 
     this.getAllWorkDicts()
   },
   methods: {
+      // 获取供应商数据
+      getListfun(){
+          getList(1,20, {corpType:'GYS'}).then(res=>{
+              console.log(res.data)
+              this.findObject(this.option.column, "corpId").dicData = res.data.data.records
+          })
+      },
     getAllWorkDicts() {
       getGoodstype().then(res => {
         this.goodsTypeList = res.data.data;
@@ -570,6 +600,18 @@ export default {
           this.form = res.data.data;
           this.data = res.data.data.stockGoodsList;
           this.filesList = res.data.data.filesList
+
+            // 判断是否是admin 权限
+            this.roleNameqx = localStorage.getItem('roleName').split(',')
+            let arr = localStorage.getItem('roleName').split(',')
+            // this.whetherIntegralChange(this.form.whetherIntegral)
+            if (arr.indexOf('admin') != -1 && res.data.data.whetherIntegral == 0) {
+                this.findObject(this.option.column, "storeIntegral").disabled = false
+                this.findObject(this.option.column, "referenceIntegral").disabled = false
+                this.findObject(this.option.column, "salesmanIntegral").disabled = false
+                this.findObject(this.option.column, "integral").disabled = false
+            }
+
           this.whetherChange(res.data.data.whether)
         })
         .finally(() => {

src/views/product/js/optionList.js

@@ -79,7 +79,7 @@ export const option = {
       }]
     },
     {
-      label: '是否为积分商品',
+      label: '积分商品',
       prop: 'whetherIntegral',
       width:140,
       filterable: true,
@@ -121,13 +121,46 @@ export const option = {
       overHidden: true,
       index: 12
     },
+    {
+      label: "厂家",
+      prop: "corpId",
+      type: "select",
+      props: {
+        label: "cname",
+        value: "id"
+      },
+      dicData: [],
+      span: 6,
+      index: 13
+    },
+    {
+      label: "采购日期",
+      prop: "exitDate",
+      type: "date",
+      format: "yyyy-MM-dd",
+      valueFormat: "yyyy-MM-dd 00:00:00",
+      span: 6,
+      index: 14
+    },
+    {
+      label: "规格",
+      prop: "specs",
+      span: 6,
+      index: 15
+    },
+    {
+      label: "品牌",
+      prop: "brand",
+      span: 6,
+      index: 16
+    },
 
     {
       label: "备注",
       prop: "remarks",
       search: true,
       overHidden: true,
-      index: 13
+      index: 17
     },
     {
       label: "状态",