修改禅道问题

src/views/analysis/stockDetail/index.vue

@@ -105,6 +105,80 @@ export default {
     });
   },
   methods: {
+       //列设置全选
+    allChecked() {
+      if (this.allCheck == true) {
+        this.setRowList.map((e) => {
+          return (e.checked = 0);
+        });
+      } else {
+        this.setRowList.map((e) => {
+          return (e.checked = 1);
+        });
+      }
+    },
+    //查询列数据
+    getRow() {
+      let that = this;
+      this.data = {
+        tableName: "库存总账详情",
+        userId: Cookies.get("userName"),
+      };
+      select(this.data).then((res) => {
+        if (res.data.length != 0) {
+          this.getRowList = res.data.filter((e) => e.checked == 0);
+          this.setRowList = res.data;
+          this.setRowList = this.setRowList.reduce((res, item) => {
+            res.push({
+              surface: item.surface,
+              label: item.label,
+              name: item.name,
+              checked: item.checked,
+              width: item.width,
+              fixed: item.fixed,
+            });
+            return res;
+          }, []);
+        }
+      });
+    },
+    //重置列表
+    delRow() {
+      this.data = {
+        tableName: "库存总账详情",
+        userId: Cookies.get("userName"),
+      };
+      resetModule(this.data).then((res) => {
+        if (res.code == 200) {
+          this.showSetting = false;
+          this.setRowList = this.tableDate;
+          this.getRowList = this.tableDate;
+        }
+      });
+    },
+    //保存列设置
+    save() {
+      this.showSetting = false;
+      this.data = {
+        tableName: "库存总账详情",
+        userId: Cookies.get("userName"),
+        sysTableSetList: this.setRowList,
+      };
+      addSet(this.data).then((res) => {
+        if (res.code == 200) {
+          this.showSetting = false;
+          this.getRowList = this.setRowList.filter((e) => e.checked == 0);
+        }
+      });
+    },
+    //开始拖拽事件
+    onStart() {
+      this.drag = true;
+    },
+    //拖拽结束事件
+    onEnd() {
+      this.drag = false;
+    },
     //跳转审批页面
     goPage(row) {
       switch (row.fBilltype) {

src/views/basicdata/area/index.vue

@@ -95,7 +95,7 @@
       <el-table-column label="地址" align="center" prop="fAddr" />
       <el-table-column label="状态" align="center" prop="fStatus" />
       <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150" fixed="right">
         <template slot-scope="scope">
           <el-button
             size="mini"

src/views/basicdata/company/index.vue

@@ -79,7 +79,7 @@
       <el-table-column label="公司名称" align="center" prop="fName" />
       <el-table-column label="状态" align="center" prop="fStatus" />
       <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150" fixed="right">
         <template slot-scope="scope">
           <el-button
             size="mini"

src/views/basicdata/contact/index.vue

@@ -99,7 +99,7 @@
       <el-table-column label="电话" align="center" prop="fTel" />
       <el-table-column label="状态" align="center" prop="fStatus" />
       <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150" fixed="right">
         <template slot-scope="scope">
           <el-button
             size="mini"

src/views/basicdata/corps/index.vue

@@ -150,7 +150,7 @@
       </el-table-column>
       <el-table-column
         label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150" fixed="right">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -184,7 +184,6 @@
       :fullscreen="dialogFull"
       :title="title"
       :visible.sync="open"
-      close-on-click-modal="false"
       width="80%"
       :close-on-click-modal="false"
       append-to-body>

src/views/basicdata/dept/index.vue

@@ -71,7 +71,7 @@
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" width="200" fixed="right" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"

src/views/basicdata/fees/index.vue

@@ -133,7 +133,7 @@
       <el-table-column label="币种" align="center" prop="fCurrency" :show-overflow-tooltip="true"  />
       <el-table-column label="状态" align="center" prop="fStatus" :formatter="statusFormat" />
       <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150" fixed="right">
         <template slot-scope="scope">
           <el-button
             size="mini"

src/views/basicdata/goods/index.vue

@@ -240,7 +240,7 @@
         label="操作"
         align="center"
         class-name="small-padding fixed-width"
-        width="100"
+        width="150" fixed="right"
       >
         <template slot-scope="scope">
           <el-button

src/views/basicdata/info/index.vue

@@ -124,7 +124,7 @@
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150" fixed="right">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -158,7 +158,7 @@
       :fullscreen="dialogFull"
       :title="title"
       :visible.sync="open"
-      close-on-click-modal="false"
+      :close-on-click-modal="false"
       width="500px" append-to-body>
       <template slot="title">
         <div class="avue-crud__dialog__header">

src/views/basicdata/location/index.vue

@@ -95,7 +95,7 @@
       <el-table-column label="地址" align="center" prop="fAddr" />
       <el-table-column label="状态" align="center" prop="fStatus" />
       <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150" fixed="right">
         <template slot-scope="scope">
           <el-button
             size="mini"

src/views/basicdata/warehouse/index.vue

@@ -139,7 +139,7 @@
             </template>
           </el-table-column>
           <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
-          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150" fixed="right">
             <template slot-scope="scope">
               <el-button
                 size="mini"

src/views/basicdata/warehousebills/index.vue

@@ -371,7 +371,7 @@ RK CK DB HZ
       <el-table-column label="单据类型(数据字典),SJRK" align="center" prop="fBilltype" :formatter="fBilltypeFormat" />
       <el-table-column label="状态(数据字典),N 入" align="center" prop="fBillstatus" :formatter="fBillstatusFormat" />
       <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150" fixed="right">
         <template slot-scope="scope">
           <el-button
             size="mini"

src/views/fleet/scheduling/AddOrUpdate.vue

@@ -79,6 +79,127 @@
             </el-form-item>
           </el-col>
         </el-row>
+                <el-row>
+          <el-col :span="6">
+            <el-form-item label="提单号" prop="mblno">
+              <el-input
+                v-model="form.mblno"
+                placeholder="请输入提单号"
+                :disabled="disabled"
+                size="mini"
+                style="width: 180px"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="货品名称" prop="goodsId">
+              <el-select
+                v-model="form.goodsId"
+                placeholder="请输入货品名称"
+                :disabled="disabled"
+                clearable
+                filterable
+                size="mini"
+                style="width: 180px"
+              >
+                <el-option
+                  v-for="(dict, index) in goodsOptions"
+                  :key="index.fId"
+                  :label="dict.fName"
+                  :value="dict.fId"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="件数" prop="qtyPlan">
+              <el-input
+                v-model="form.qtyPlan"
+                placeholder="请输入件数"
+                :disabled="disabled"
+                v-input-limit="2"
+                size="mini"
+                style="width: 180px"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="重量(吨)" prop="weightPlan">
+              <el-input
+                v-model="form.weightPlan"
+                placeholder="请输入重量"
+                :disabled="disabled"
+                v-input-limit="2"
+                size="mini"
+                style="width: 180px"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="船名" prop="ysl">
+              <el-input
+                v-model="form.ysl"
+                placeholder="请输入船名"
+                :disabled="disabled"
+                size="mini"
+                style="width: 180px"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="航次" prop="voy">
+              <el-input
+                v-model="form.voy"
+                placeholder="请输入航次"
+                :disabled="disabled"
+                size="mini"
+                style="width: 180px"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="起运港" prop="polId">
+              <el-select
+                v-model="form.polId"
+                placeholder="请输入起运港"
+                :clearable="true"
+                filterable
+                :disabled="disabled"
+                size="mini"
+                style="width: 180px"
+              >
+                <el-option
+                  v-for="(dict, index) in polList"
+                  :key="index.fId"
+                  :label="dict.fName"
+                  :value="dict.fId"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="目的港" prop="podId">
+              <el-select
+                v-model="form.podId"
+                placeholder="请输入目的港"
+                :clearable="true"
+                filterable
+                :disabled="disabled"
+                size="mini"
+                style="width: 180px"
+              >
+                <el-option
+                  v-for="(dict, index) in podList"
+                  :key="index.fId"
+                  :label="dict.fName"
+                  :value="dict.fId"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row>
           <el-col :span="6">
             <el-form-item label="装车地点" prop="loadAddr">
@@ -246,127 +367,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
-          <el-col :span="6">
-            <el-form-item label="提单号" prop="mblno">
-              <el-input
-                v-model="form.mblno"
-                placeholder="请输入提单号"
-                :disabled="disabled"
-                size="mini"
-                style="width: 180px"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="货品名称" prop="goodsId">
-              <el-select
-                v-model="form.goodsId"
-                placeholder="请输入货品名称"
-                :disabled="disabled"
-                clearable
-                filterable
-                size="mini"
-                style="width: 180px"
-              >
-                <el-option
-                  v-for="(dict, index) in goodsOptions"
-                  :key="index.fId"
-                  :label="dict.fName"
-                  :value="dict.fId"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="件数" prop="qtyPlan">
-              <el-input
-                v-model="form.qtyPlan"
-                placeholder="请输入件数"
-                :disabled="disabled"
-                v-input-limit="2"
-                size="mini"
-                style="width: 180px"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="重量(吨)" prop="weightPlan">
-              <el-input
-                v-model="form.weightPlan"
-                placeholder="请输入重量"
-                :disabled="disabled"
-                v-input-limit="2"
-                size="mini"
-                style="width: 180px"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="6">
-            <el-form-item label="船名" prop="ysl">
-              <el-input
-                v-model="form.ysl"
-                placeholder="请输入船名"
-                :disabled="disabled"
-                size="mini"
-                style="width: 180px"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="航次" prop="voy">
-              <el-input
-                v-model="form.voy"
-                placeholder="请输入航次"
-                :disabled="disabled"
-                size="mini"
-                style="width: 180px"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="起运港" prop="polId">
-              <el-select
-                v-model="form.polId"
-                placeholder="请输入起运港"
-                :clearable="true"
-                filterable
-                :disabled="disabled"
-                size="mini"
-                style="width: 180px"
-              >
-                <el-option
-                  v-for="(dict, index) in polList"
-                  :key="index.fId"
-                  :label="dict.fName"
-                  :value="dict.fId"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="目的港" prop="podId">
-              <el-select
-                v-model="form.podId"
-                placeholder="请输入目的港"
-                :clearable="true"
-                filterable
-                :disabled="disabled"
-                size="mini"
-                style="width: 180px"
-              >
-                <el-option
-                  v-for="(dict, index) in podList"
-                  :key="index.fId"
-                  :label="dict.fName"
-                  :value="dict.fId"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
         <el-row v-if="form.transType == 3">
           <el-col :span="6">
             <el-form-item label="损耗单位" prop="goodsLossType">

src/views/login.vue

@@ -52,7 +52,7 @@
     </el-form>
     <!--  底部  -->
     <div class="el-login-footer">
-      <span><a href="https://beian.miit.gov.cn/">鲁ICP备2021000559号-1</a>  青岛途宝软件开发有限公司</span>
+      <img src="./icp.png" alt="" height="14px" style="margin-right:2px"> <span><a href="http://www.beian.gov.cn/portal/registerSystemInfo?recordcode=37021302000853">鲁公网安备 37021302000853号</a> <a href="https://beian.miit.gov.cn/">鲁ICP备2021000559号-1</a>  青岛途宝软件开发有限公司</span>
     </div>
   </div>
 </template>
@@ -208,7 +208,6 @@ export default {
 }
 .el-login-footer {
   height: 40px;
-  line-height: 40px;
   position: fixed;
   bottom: 0;
   width: 100%;
@@ -216,7 +215,9 @@ export default {
   color: #fff;
   font-family: Arial;
   font-size: 12px;
-  letter-spacing: 1px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
 }
 .login-code-img {
   height: 38px;

src/views/track/cabinet/AddOrUpdate.vue

@@ -1381,6 +1381,15 @@ export default {
     submitForm(butType) {
       this.$refs["form"].validate((valid) => {
         if (valid) {
+          if(this.form.costOth>0&&!this.form.costRemarks){
+            return this.$message.error("请输入花销备注");
+          }
+          if(this.form.costomAmt02>0&&!this.form.costomStr02){
+            return this.$message.error("请输入费用备注");
+          }
+           if(this.form.costomAmt01>0&&!this.form.costomStr01){
+            return this.$message.error("请输入费用备注");
+          }
           this.DList.map((e) => {
             return (e.fDc = "D");
           });