Merge branch 'master' of git.echepei.com:zhujiawei/Warehouse_management_ui into master

src/views/kaihe/applyForInvoice/invoiceInformation/index.vue

@@ -465,19 +465,11 @@
 
           <el-button
             type="primary"
-            size="small"
             @click="confirmCharge"
             :disabled="notChange"
             >请核</el-button
           >
-          <el-button
-            type="success"
-            size="small"
-            @click="confirmCharge"
-            :disabled="notChange"
-            v-if="feeInfo"
-          >搜索</el-button
-          >
+
         </div>
         <div style="margin: 0 12px">
           <el-button
@@ -488,80 +480,6 @@
           ></el-button>
         </div>
       </div>
-      <el-dialog
-        title="自定义列显示"
-        :visible.sync="showSetting2"
-        width="700px"
-        v-dialogDrag
-        append-to-body
-      >
-        <template slot="title">
-          <div class="avue-crud__dialog__header">
-            <span class="el-dialog__title">
-              <span
-                style="
-                  display: inline-block;
-                  width: 3px;
-                  height: 20px;
-                  margin-right: 5px;
-                  float: left;
-                  margin-top: 2px;
-                "
-              ></span>
-            </span>
-          </div>
-        </template>
-        <div>配置排序列数据（拖动调整顺序）</div>
-        <div style="margin-left: 17px">
-          <el-checkbox
-            v-model="allCheck2"
-            label="全选"
-            @change="allChecked2"
-          ></el-checkbox>
-        </div>
-        <div style="padding: 4px; display: flex; justify-content: center">
-          <draggable
-            v-model="setRowList2"
-            group="site"
-            animation="300"
-            @start="onStart"
-            @end="onEnd"
-            handle=".indraggable"
-          >
-            <transition-group>
-              <div
-                v-for="item in setRowList2"
-                :key="item.surface"
-                class="listStyle"
-              >
-                <div style="width: 500px" class="indraggable">
-                  <div class="progress" :style="{ width: item.width + 'px' }">
-                    <el-checkbox
-                      :label="item.name"
-                      v-model="item.checked"
-                      :true-label="0"
-                      :false-label="1"
-                      >{{ item.name }}
-                    </el-checkbox>
-                  </div>
-                </div>
-                <el-input-number
-                  v-model.number="item.width"
-                  controls-position="right"
-                  :min="1"
-                  :max="500"
-                  size="mini"
-                ></el-input-number>
-              </div>
-            </transition-group>
-          </draggable>
-        </div>
-        <span slot="footer" class="dialog-footer">
-          <el-button @click="showSetting2 = false">取 消</el-button>
-          <el-button @click="delRow2" type="danger">重 置</el-button>
-          <el-button type="primary" @click="save2()">确 定</el-button>
-        </span>
-      </el-dialog>
 
       <el-menu
         :default-active="activeIndex"
@@ -574,25 +492,166 @@
         <el-menu-item index="1">费用信息</el-menu-item>
         <el-menu-item index="2">发票信息</el-menu-item>
       </el-menu>
+      <div style="margin:10px">
+        <el-button
+          type="success"
+          size="small"
+          @click="confirmCharge"
+          :disabled="notChange"
+          v-if="invoiceInfo"
+        >新行</el-button
+        >
+        <el-button
+          type="success"
+          size="small"
+          @click="confirmCharge"
+          :disabled="notChange"
+          v-if="feeInfo"
+        >搜索</el-button
+        >
+      </div>
       <el-table
         v-if="feeInfo"
         v-loading="loading"
         :data="increase_s"
         @selection-change="handleSelectionChange_s"
       >
-        <!-- <el-table-column type="selection" width="55" align="center"/> -->
+         <el-table-column type="selection" width="55" align="center"/>
         <el-table-column label="序号" type="index" align="center" />
+        <el-table-column label="业务编号" align="center" prop="fBillno"/>
+        <el-table-column label="客户名称" align="center" prop="fBillno"/>
+        <el-table-column label="开票单位" align="center" prop="fBillno"/>
+        <el-table-column label="金额" align="center" prop="fBillno"/>
+        <el-table-column label="申请日期" align="center" prop="fBillno"/>
+        <el-table-column label="申请人" align="center" prop="fBillno"/>
+        <el-table-column label="申请单位" align="center" prop="fBillno"/>
+        <el-table-column label="状态" align="center" prop="fBillno"/>
+        <el-table-column label="审核日期" align="center" prop="fBillno"/>
+        <el-table-column label="审核人" align="center" prop="fBillno"/>
+        <el-table-column label="备注" align="center" prop="fBillno"/>
         <el-table-column
-          v-for="(item, index) in getRowList2"
-          :key="index"
-          :label="item.name"
-          :width="item.width"
-          :prop="item.label"
+          label="操作"
           align="center"
-          :show-overflow-tooltip="true"
-          sortable
-          :fixed="item.fixed"
-        />
+          class-name="small-padding fixed-width"
+        >
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-delete"
+              @click.native.prevent="deleteRow(scope.$index, increase_s)"
+              :disabled="notChange"
+              >删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-table
+        v-if="invoiceInfo"
+        v-loading="loading"
+        :data="increase_s"
+        @selection-change="handleSelectionChange_s"
+      >
+         <el-table-column type="selection" width="55" align="center"/>
+        <el-table-column label="序号" type="index" align="center" />
+        <el-table-column label="货物或应税劳务、服务名称" align="center" prop="fBillno" min-width="200px">
+          <template slot-scope="scope">
+            <el-input
+              v-model="scope.row.fBillno"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="规格型号" align="center" prop="fBillno">
+          <template slot-scope="scope">
+            <el-input
+              v-model="scope.row.fBillno"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="单位" align="center" prop="fBillno">
+          <template slot-scope="scope">
+            <el-input
+              v-model="scope.row.fBillno"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="数量" align="center" prop="fBillno">
+          <template slot-scope="scope">
+            <el-input
+              v-model="scope.row.fBillno"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="单价（含税）" align="center" prop="fBillno" min-width="100px">
+          <template slot-scope="scope">
+            <el-input
+              v-model="scope.row.fBillno"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="金额（含税）" align="center" prop="fBillno" min-width="100px">
+          <template slot-scope="scope">
+            <el-input
+              v-model="scope.row.fBillno"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="税率" align="center" prop="fBillno">
+          <template slot-scope="scope">
+            <el-input
+              v-model="scope.row.fBillno"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="税额" align="center" prop="fBillno">
+          <template slot-scope="scope">
+            <el-input
+              v-model="scope.row.fBillno"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="合计金额" align="center" prop="fBillno">
+          <template slot-scope="scope">
+            <el-input
+              v-model="scope.row.fBillno"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="商品信息" align="center" prop="fBillno">
+          <template slot-scope="scope">
+            <el-input
+              v-model="scope.row.fBillno"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="作废状态" align="center" prop="fBillno">
+          <template slot-scope="scope">
+            <el-select
+              v-model="scope.row.fBillno">
+              <el-option label="是" value="1"/>
+              <el-option label="否" value="2"/>
+            </el-select>
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" align="center" prop="fBillno">
+          <template slot-scope="scope">
+            <el-input
+              v-model="scope.row.fBillno"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="录入人" align="center" prop="fBillno">
+          <template slot-scope="scope">
+            <el-input
+              v-model="scope.row.fBillno"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="作废人" align="center" prop="fBillno">
+          <template slot-scope="scope">
+            <el-input
+              v-model="scope.row.fBillno"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="作废时间" align="center" prop="fBillno">
+          <template slot-scope="scope">
+            <el-date-picker
+              v-model="scope.row.fBillno"
+              type="date"
+              placeholder="选择日期"
+              format="yyyy 年 MM 月 dd 日"
+              value-format="yyyy-MM-dd">
+            </el-date-picker>
+          </template>
+        </el-table-column>
         <el-table-column
           label="操作"
           align="center"
@@ -605,7 +664,7 @@
               icon="el-icon-delete"
               @click.native.prevent="deleteRow(scope.$index, increase_s)"
               :disabled="notChange"
-              >删除
+            >删除
             </el-button>
           </template>
         </el-table-column>
@@ -1049,98 +1108,8 @@ export default {
           width: 120,
         }
       ],
-      tableDate2: [
-        {
-          surface: "1",
-          label: "fMblno",
-          name: "业务编号",
-          checked: 0,
-          width: 100,
-        },
-        {
-          surface: "2",
-          label: "fBscorpno",
-          name: "船名",
-          checked: 0,
-          width: 100,
-        },
-        {
-          surface: "3",
-          label: "fProductName",
-          name: "航次",
-          checked: 0,
-          width: 100,
-        },
-        {
-          surface: "4",
-          label: "fBsdate",
-          name: "提单号",
-          checked: 0,
-          width: 100,
-        },
-        {
-          surface: "5",
-          label: "fFeeName",
-          name: "费用名称",
-          checked: 0,
-          width: 100,
-        },
-        {
-          surface: "6",
-          label: "fSrcdc",
-          name: "币别",
-          checked: 0,
-          width: 100,
-        },
-        {
-          surface: "7",
-          label: "fBilltype",
-          name: "金额",
-          checked: 0,
-          width: 100,
-        },
-        {
-          surface: "8",
-          label: "fBusinessType",
-          name: "汇率",
-          checked: 0,
-          width: 100,
-        },
-        {
-          surface: "9",
-          label: "fAmtdr",
-          name: "业务类型",
-          checked: 0,
-          width: 100,
-        },
-        {
-          surface: "10",
-          label: "fAmt",
-          name: "状态",
-          checked: 0,
-          width: 100,
-        },
-        {
-          surface: "11",
-          label: "fRemarks",
-          name: "审核日期",
-          checked: 0,
-          width: 100,
-        },
-        {
-          surface: "12",
-          label: "remark",
-          name: "备注",
-          checked: 0,
-          width: 100,
-        },
-      ],
       setRowList: [],
       getRowList: [],
-      setRowList2: [],
-      getRowList2: [],
-      allCheck2: false,
-      showSetting2: false,
       //自定义列宽
       allCheck: false,
       showSetting:false,
@@ -1279,8 +1248,6 @@ export default {
   created() {
     this.setRowList = this.tableDate;
     this.getRowList = this.tableDate;
-    this.setRowList2 = this.tableDate2;
-    this.getRowList2 = this.tableDate2;
     this.typevalue = Cookies.get("sysType");
     this.getList();
     this.register();
@@ -1290,7 +1257,7 @@ export default {
     this.getDicts("data_settlement_type").then((response) => {
       this.methodOptions = response.data;
     });
-    // this.getRow();
+    this.getRow();
   },
   activated() {
     this.adoPt();
@@ -1300,6 +1267,7 @@ export default {
       console.log(key, keyPath);
       if(key === '1') {
         this.feeInfo = true
+        this.invoiceInfo = false
       }else{
         this.feeInfo = false
         this.invoiceInfo = true
@@ -1343,7 +1311,7 @@ export default {
     getRow() {
       let that = this;
       this.data = {
-        tableName: "收费",
+        tableName: "申请费用",
         userId: Cookies.get("userName"),
       };
       select(this.data).then((res) => {
@@ -1402,31 +1370,6 @@ export default {
         });
       }
     },
-    //查询列数据
-    getRow2() {
-      let that = this;
-      this.data = {
-        tableName: "收费明细",
-        userId: Cookies.get("userName"),
-      };
-      select(this.data).then((res) => {
-        if (res.data.length != 0) {
-          this.getRowList2 = res.data.filter((e) => e.checked == 0);
-          this.setRowList2 = res.data;
-          this.setRowList2 = this.setRowList2.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;
-          }, []);
-        }
-      });
-    },
     //保存列设置
     save2() {
       this.showSetting2 = false;

src/views/kaihe/containerNews/modifyPage/index.vue

@@ -197,13 +197,13 @@
       <!--      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>-->
 
       <div style="margin: 0 12px;float: right">
-        <el-button
-          type="primary"
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['basicdata:yard:import']"
-        >导入</el-button>
+<!--        <el-button-->
+<!--          type="primary"-->
+<!--          icon="el-icon-download"-->
+<!--          size="mini"-->
+<!--          @click="handleExport"-->
+<!--          v-hasPermi="['basicdata:yard:import']"-->
+<!--        >导入</el-button>-->
         <el-tooltip
           class="item"
           effect="dark"
@@ -1040,7 +1040,6 @@ export default {
         // this.$router.push({
         //   path: "/containerNews/boxDistribution",
         // });
-        console.log(this.corpsList.length)
         if (this.querDate) {
           addmodify(this.querDate).then(response => {
             this.corpsList = response.rows

src/views/kaihe/shipDynamics/oceanFreightRate/index.vue

@@ -294,32 +294,6 @@
           <span v-if="item.label == 'updateTime'">{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-<!--      <el-table-column :show-overflow-tooltip="true" label="装货港" align="center" prop="portofloadidName" width="100px"/>-->
-<!--      <el-table-column :show-overflow-tooltip="true" label="目的港" align="center" width="100px" prop="distinationidName" />-->
-<!--      <el-table-column :show-overflow-tooltip="true" label="中转港" align="center" prop="portoftransshipmentName" />-->
-<!--      <el-table-column :show-overflow-tooltip="true" label="预计开船日期" align="center" prop="fEtd" />-->
-<!--      <el-table-column :show-overflow-tooltip="true" label="预计到达日期" align="center" prop="fEta" />-->
-<!--      <el-table-column :show-overflow-tooltip="true" label="航期" align="center" prop="fDays" />-->
-<!--      <el-table-column :show-overflow-tooltip="true" label="有效期起" align="center" prop="fBegindate" />-->
-<!--      <el-table-column :show-overflow-tooltip="true" label="有效期至" align="center" prop="fEnd" />-->
-<!--      <el-table-column :show-overflow-tooltip="true" label="总teu" align="center" prop="fTeu" />-->
-<!--      <el-table-column :show-overflow-tooltip="true" label="航期" align="center" prop="fDates" />-->
-<!--&lt;!&ndash;      <el-table-column :show-overflow-tooltip="true" label="单价" align="center" prop="fPrice" />&ndash;&gt;-->
-<!--&lt;!&ndash;      <el-table-column :show-overflow-tooltip="true" label="集装箱" align="center" prop="fCntrid" />&ndash;&gt;-->
-<!--      <el-table-column :show-overflow-tooltip="true" label="状态" align="center" prop="fStatus" />-->
-<!--&lt;!&ndash;      <el-table-column :show-overflow-tooltip="true" label="备注" align="center" prop="remark" />&ndash;&gt;-->
-<!--      <el-table-column label="录入人" align="center" prop="createBy" />-->
-<!--      <el-table-column label="录入时间" align="center" prop="createTime" width="100">-->
-<!--        <template slot-scope="scope">-->
-<!--          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
-<!--      <el-table-column label="最新修改人" align="center" prop="updateBy" width="100px"/>-->
-<!--      <el-table-column label="最新修改时间" align="center" prop="updateTime" width="100px">-->
-<!--        <template slot-scope="scope">-->
-<!--          <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
 
       <el-table-column label="操作" fixed="right" align="center" class-name="small-padding fixed-width" width="120px">
         <template slot-scope="scope">
@@ -926,15 +900,15 @@
         },
         // 表单校验
         rules: {
+          fDates:[
+            { required: true, message: "航期不能为空", trigger: "blur" }
+          ],
            fPortofloadid: [
             { required: true, message: "装货港不能为空", trigger: "blur" }
           ],
           fDistinationid: [
             { required: true, message: "目的港不能为空", trigger: "blur" }
           ],
-          fPortoftransshipment: [
-            { required: true, message: "中转港不能为空", trigger: "blur" }
-          ],
           fEtd:[
             { required: true, message: "预计开船日期不能为空", trigger: "blur" }
           ],
@@ -944,6 +918,9 @@
           fBegindate: [
             { required: true, message: "有效期起不能为空", trigger: "blur" }
           ],
+          fEnd: [
+            { required: true, message: "有效期至不能为空", trigger: "blur" }
+          ],
         }
       };
     },
@@ -1083,7 +1060,9 @@
         this.loading = true;
         listCorps(this.queryParams).then(response => {
           for(let li in response.rows){
-            response.rows[li].fDates = JSON.parse(response.rows[li].fDates).join(",")
+            if(response.rows[li].fDates){
+              response.rows[li].fDates = JSON.parse(response.rows[li].fDates).join(",")
+            }
           }
           this.corpsList = response.rows;
           this.total = response.total;