Merge branch 'master' of http://git.zthymaoyi.com/wangchao/yiliangyiyun-pc-jj

src/api/V2/speedGoods.js

@@ -0,0 +1,9 @@
+
+const baseUrl = process.env.VUE_APP_API_NEWS
+
+
+// 极速版货名list
+export const API_GET_SPEEDGOODSLIST = `${baseUrl}/speedGoodsInfo/selectInfo`
+export const API_GET_SPEEDGOODSADD = `${baseUrl}/speedGoodsInfo/api/addInfo`
+export const api_speedPositionInfoList = `${baseUrl}/speedPositionInfo/selectInfo`
+export const api_speedPositionInfoAdd = `${baseUrl}/speedPositionInfo/api/addInfo `

src/model/speedGoods.js

@@ -0,0 +1,13 @@
+
+import { API_GET_SPEEDGOODSLIST,API_GET_SPEEDGOODSADD,api_speedPositionInfoList,api_speedPositionInfoAdd } from '@/api/V2/speedGoods'
+import { errorCatcher, errorHandle, filter } from 'base-core-lib'
+import { appRx } from './defalutConfig/indexRx'
+
+export const speedGoodsList = appRx.get(API_GET_SPEEDGOODSLIST, errorCatcher, errorHandle, filter)
+export const speedGoodsAdd = appRx.post(API_GET_SPEEDGOODSADD, errorCatcher, errorHandle, filter)
+
+
+export const speedPositionInfoList = appRx.get(api_speedPositionInfoList, errorCatcher, errorHandle, filter)
+export const speedPositionInfoAdd = appRx.post(api_speedPositionInfoAdd, errorCatcher, errorHandle, filter)
+
+

src/views/cost/cost.vue

@@ -1,53 +1,251 @@
 
 <template>
-    <div class="bg" id="index">
-      1发11
+  <div class="bg" id="index">
+    <div class="row1">
+      <div class="left">
+        <el-date-picker v-model="value2" type="daterange" align="right" unlink-panels range-separator="至"
+          start-placeholder="开始日期" end-placeholder="结束日期">
+        </el-date-picker>
+
+      </div>
+      <div class="right">
+        <el-input :placeholder="'可按费用名称、备注内容查找'" clearable v-model="searchKeyWord" class="search_css"></el-input>
+        <el-button type="primary" size="small" @click="lookup" class="search">查找</el-button>
+      </div>
     </div>
-  </template>
-  
-  <script>
-  import {
-    gChartsData,
-  } from '@/model/home/index'
-  // import CenterMap from "./center-map.vue";
-  export default {
-    components: {
-    },
-    data() {
-      return {
-       
-      };
-    },
-    filters: {
-      numsFilter(msg) {
-        return msg || 0;
-      },
-    },
-    created() {
-    },
-    mounted() {
-     
+    <div class="row2">
+      <div class="left">
+        <el-button type="primary" size="small">全部</el-button>
+        <el-button type="primary" size="small">收入</el-button>
+        <el-button type="primary" size="small">支出</el-button>
+        <div>
+          <div class="text">合计：收入{{ 22 }} - 支出{{ 22 }}=利润{{ 0 }}</div>
+        </div>
+      </div>
+      <div class="right">
+        <el-button type="primary" size="small" @click="add()">添加</el-button>
+      </div>
+    </div>
+    <el-table ref="singleTable" :data="tableData" highlight-current-row style="width: 100%" class="table">
+      <el-table-column type="index" width="50">
+      </el-table-column>
+      <el-table-column property="date" label="类型" width="120">
+      </el-table-column>
+      <el-table-column property="name" label="费用名称" width="120">
+      </el-table-column>
+      <el-table-column property="address" label="金额（元）">
+      </el-table-column>
+      <el-table-column property="address" label="备注">
+      </el-table-column>
+      <el-table-column prop="address" label="附件" show-overflow-tooltip>
+        <template slot-scope="scope">
+          <img width="18" height="20" style="vertical-align: text-top; position: relative; top: -1px"
+            src="../../../public/img/fujian.png" @click="fujian(scope.row)" alt="" />
+          <span v-if="scope.row.addressUrlArray != null">
+            {{
+              scope.row.addressUrlArray.length == 0
+              ? ''
+              : scope.row.addressUrlArray.length
+            }}
+          </span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="address" label="操作" show-overflow-tooltip>
+        <template scope="scope">
+          <span style="color: #409EFF;margin-right:5px" @click="edit(scope.row)">编辑</span>
+          <span style="color: red;" @click="del(scope.row)">删除</span>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div style="text-align: center; padding: 10px">
+      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
+        :page-size="deptCircularPage.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal">
+      </el-pagination>
+      <WinseaContentModal v-model="accessoryTFs" :title="$t('system.noticeCircular.information')"
+        @on-cancel="handleClose">
+        <div v-if="applstatus">
+          <ws-upload ref="upload" :size-limit="size" @onChange="onChange" :comp-id="compId" :appendix-ids="appendixIdss"
+            accept=".jpg, .jpeg, .png, .pdf, .doc, .docx, .zip, .rar"
+            v-hasPermission="`contractManagement.buyContract.buyContractInfo.appl`" />
+        </div>
+        <ws-upload v-else ref="upload" :comp-id="compId" :appendix-ids="appendixIdss" :editable="false"
+          accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
+      </WinseaContentModal>
+      <WinseaContentModal v-model="show" title="费用" @on-cancel="handleClose3">
+        <el-form>
+          <el-form-item label-width='100px' label="收款方" span="1" prop="payee">
+            <el-input class='input50 input_css' placeholder="输入收款方"></el-input>
+          </el-form-item>
+          <ws-upload style="margin-left:30px" ref="upload" table-name="maintain_work_order" oss-key="mainPlan"
+            :comp-id="compId" :appendix-ids="appendixIdsAdd" :vesselId="deptBudgetList.addressUrl" :size-limit="size"
+            @uploadSuccess="uploadSuccess" @onChange="onChange" accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button @click="handleClose3">取 消</el-button>
+          <el-button @click="submitdata">提交</el-button>
+        </div>
+      </WinseaContentModal>
+    </div>
+  </div>
+</template>
   
+<script>
+import WsUpload from '@/components/WsUpload'
+export default {
+  components: {
+    WsUpload
+  },
+  data() {
+    return {
+      fileNum: '',
+      size: 10,
+      appendixIdsAdd: '',
+      show: false,
+      deptBudgetList: {},
+      compId: localStorage.getItem('ws-pf_compId'),
+      appendixIdss: [],
+      applstatus: false,
+      accessoryTFs: false,
+      deptCircularPage: {},
+      deptBudgetTotal: 0,
+      currentPage: 1,
+      pageSize: 10,
+      id: '',
+      tableData: [{
+        date: '2016-05-02',
+        name: '王小虎',
+        address: '上海市普陀区金沙江路 1518 弄'
+      }, {
+        date: '2016-05-04',
+        name: '王小虎',
+        address: '上海市普陀区金沙江路 1517 弄'
+      }, {
+        date: '2016-05-01',
+        name: '王小虎',
+        address: '上海市普陀区金沙江路 1519 弄'
+      }, {
+        date: '2016-05-03',
+        name: '王小虎',
+        address: '上海市普陀区金沙江路 1516 弄'
+      }],
+      value2: '',
+      searchKeyWord: ''
+    };
+  },
+  filters: {
+    numsFilter(msg) {
+      return msg || 0;
     },
-    beforeDestroy() {
-   
-      
+  },
+  created() {
+  },
+  mounted() {
+
+
+  },
+  beforeDestroy() {
+
+
+  },
+  methods: {
+    submitdata() { },
+    onChange(files) {
+      this.fileNum = files
+      this.$refs.upload.handleSaveBill().then((res) => {
+        console.log(files)
+      })
     },
-    methods: {
+    uploadSuccess(data, files, url) {
+      console.log(data, files, url)
+
+      // this.deptBudgetList.
+      // this.formData.append('files', files)
+      // this.feedbackObj.uploadNameAttachment = data.appendixName
+      // this.feedbackObj.pathUploadAttachment = data.appendixPath
+      // // this.newAppendixs = files
+      // this.onChangeFlag = true
     },
-  };
-  </script>
-  <style lang="scss" scoped>
-  
-  .bg {
-    width: 100%;
-    height: 100%;
-    padding: 16px 16px 10px 16px;
-    box-sizing: border-box;
-    // background-image: url("../../assets/images/pageBg.png");
-    background-size: cover;
-    background-position: center center;
+    handleClose3() {
+      this.show = false
+    },
+    handleClose() {
+      // this.dialogViewSpareMoney = false
+    },
+    fujian(row) {
+      this.id = row.id
+      this.accessoryTFs = true
+      this.appendixIdss = row.addressUrl
+      console.log(this.appendixIdss)
+    },
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`)
+      this.pageSize = val
+      this.getList()
+    },
+    handleCurrentChange(val) {
+      this.currentPage = val
+      console.log(`当前页: ${val}`)
+      this.getList()
+    },
+    edit() { },
+    del(val) {
+      this.$confirm('确定删除费用信息？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+      }).catch(() => {
+        return false
+      });
+    },
+    lookup() { },
+    add() {
+      this.show = true
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.bg {
+  width: 100%;
+  height: 100%;
+  padding: 16px 16px 10px 16px;
+  box-sizing: border-box;
+  // background-image: url("../../assets/images/pageBg.png");
+  background-size: cover;
+  background-position: center center;
+}
+
+.row1 {
+  display: flex;
+  justify-content: space-between;
+
+  .right {
+    display: flex;
   }
-  
-  </style>
+}
+
+.search {
+  margin-left: 10px;
+}
+
+.row2 {
+  margin-top: 20px;
+  display: flex;
+  justify-content: space-between;
+
+  .left {
+    display: flex;
+    align-items: center;
+
+    .text {
+      margin: 0 10px;
+    }
+  }
+}
+
+.table {
+  margin-top: 20px;
+}
+</style>
   

src/views/customer/customer.vue

@@ -1,53 +1,173 @@
-
 <template>
-    <div class="bg" id="index">
-      1发1111
+  <div class="bg" id="index">
+    <div class="row1">
+      <div class="left">
+        <el-input :placeholder="'可按客户名、手机号查找'" clearable v-model="searchKeyWord" class="search_css"></el-input>
+        <el-button type="primary" size="small" @click="lookup" class="search">查找</el-button>
+      </div>
+      <div class="right">
+        <el-button type="primary" size="small" @click="add()">添加</el-button>
+      </div>
     </div>
-  </template>
-  
-  <script>
-  import {
-    gChartsData,
-  } from '@/model/home/index'
-  // import CenterMap from "./center-map.vue";
-  export default {
-    components: {
-    },
-    data() {
-      return {
-       
-      };
-    },
-    filters: {
-      numsFilter(msg) {
-        return msg || 0;
-      },
+    <el-table ref="singleTable" :data="tableData" highlight-current-row style="width: 100%" class="table">
+      <el-table-column type="index" width="50">
+      </el-table-column>
+      <el-table-column property="date" label="姓名" width="120">
+      </el-table-column>
+      <el-table-column property="name" label="手机号" width="120">
+      </el-table-column>
+      <el-table-column property="address" label="银行卡号">
+      </el-table-column>
+      <el-table-column property="address" label="开户行">
+      </el-table-column>
+      <el-table-column property="address" label="开户支行">
+      </el-table-column>
+      <el-table-column prop="address" label="操作" show-overflow-tooltip>
+        <template scope="scope">
+          <span style="color: #409EFF;margin-right:5px" @click="edit(scope.row)">编辑</span>
+          <span style="color: red;" @click="del(scope.row)">删除</span>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div style="text-align: center; padding: 10px">
+      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
+        :page-size="deptCircularPage.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal">
+      </el-pagination>
+    </div>
+    <el-dialog width="320px" title="客户" :visible.sync="isShowInventory" :append-to-body="true" :close="inventoryClose">
+      <el-form class="customer" label-position="right" label-width="80px">
+        <el-form-item class="customer-item" label="姓名">
+          <el-input disabled placeholder="请输入身份证号" maxlength="100" size="small" />
+        </el-form-item>
+        <el-form-item class="customer-item" label="手机号">
+          <el-input disabled placeholder="请输入身份证号" maxlength="100" size="small" />
+        </el-form-item>
+        <el-form-item class="customer-item" label="银行卡号">
+          <el-input disabled placeholder="请输入身份证号" maxlength="100" size="small" />
+        </el-form-item>
+        <el-form-item class="customer-item" label="开户行">
+          <el-input disabled placeholder="请输入身份证号" maxlength="100" size="small" />
+        </el-form-item>
+        <el-form-item class="customer-item" label="开户支行">
+          <el-input disabled placeholder="请输入身份证号" maxlength="100" size="small" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <!-- <el-button @click="customerclose">取 消</el-button> -->
+        <el-button @click="customerConfirm" type='primary'>提交</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  gChartsData,
+} from '@/model/home/index'
+// import CenterMap from "./center-map.vue";
+export default {
+  components: {
+  },
+  data() {
+    return {
+      deptCircularPage: {},
+      deptBudgetTotal: 0,
+      currentPage: 1,
+      pageSize: 10,
+      tableData: [{
+        date: '2016-05-02',
+        name: '王小虎',
+        address: '上海市普陀区金沙江路 1518 弄'
+      }, {
+        date: '2016-05-04',
+        name: '王小虎',
+        address: '上海市普陀区金沙江路 1517 弄'
+      }, {
+        date: '2016-05-01',
+        name: '王小虎',
+        address: '上海市普陀区金沙江路 1519 弄'
+      }, {
+        date: '2016-05-03',
+        name: '王小虎',
+        address: '上海市普陀区金沙江路 1516 弄'
+      }],
+      currentRow: null,
+      searchKeyWord: '',
+      isShowInventory: false,
+    };
+  },
+  created() {
+  },
+  mounted() {
+
+
+  },
+  beforeDestroy() {
+
+
+  },
+  methods: {
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`)
+      this.pageSize = val
+      // this.getList()
     },
-    created() {
+    handleCurrentChange(val) {
+      this.currentPage = val
+      console.log(`当前页: ${val}`)
+      this.getList()
     },
-    mounted() {
-     
-  
+    lookup() { },
+    edit() { },
+    del(val) {
+      this.$confirm('确定删除客户信息？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+      }).catch(() => {
+        return false
+      });
     },
-    beforeDestroy() {
-   
-      
+    inventoryClose() {
+      this.isShowInventory = false
     },
-    methods: {
+    add() {
+      this.isShowInventory = true
     },
-  };
-  </script>
-  <style lang="scss" scoped>
-  
-  .bg {
-    width: 100%;
-    height: 100%;
-    padding: 16px 16px 10px 16px;
-    box-sizing: border-box;
-    // background-image: url("../../assets/images/pageBg.png");
-    background-size: cover;
-    background-position: center center;
+    customerConfirm() { }
+  },
+};
+</script>
+<style lang="scss" scoped>
+.bg {
+  width: 100%;
+  height: 100%;
+  padding: 16px 16px 10px 16px;
+  box-sizing: border-box;
+  // background-image: url("../../assets/images/pageBg.png");
+  background-size: cover;
+  background-position: center center;
+}
+
+.row1 {
+  display: flex;
+  justify-content: space-between;
+
+  .left {
+    display: flex;
   }
-  
-  </style>
-  
+}
+
+.search {
+  margin-left: 10px;
+}
+
+.table {
+  margin-top: 20px;
+}
+
+.table {
+  margin-top: 20px;
+}
+</style>

src/views/login/index.vue

@@ -147,10 +147,11 @@
               label-position="left">
               <el-form-item prop="companyName">
                 <!-- <el-input v-model="loginForm.companyName" :placeholder="$t('login.verification08')" /> -->
-                <el-select v-model="loginForm.companyName" filterable placeholder="请选择" class="comp-select">
+                <!-- <el-select v-model="loginForm.companyName" filterable placeholder="请选择" class="comp-select">
                   <el-option v-for="(item,index) in compOptionList" :key="index" :label="item.compName" :value="item.compName">
                   </el-option>
-                </el-select>
+                </el-select> -->
+                <el-input ref="username" v-model="loginForm.companyName" placeholder="请输入公司名称" type="text" auto-complete="on" />
               </el-form-item>
               <el-form-item prop="username">
                 <el-input ref="username" v-model="loginForm.username" :placeholder="$t('login.select01')"
@@ -545,7 +546,7 @@
       } else if (this.loginForm.password === '') {
         this.$refs.password.focus()
       }
-      this.compList()
+      // this.compList()
     },
     watch: {
       loginFlag(value) {

src/views/record/record.vue

@@ -1,53 +1,467 @@
 
 <template>
-    <div class="bg" id="index">
-      1发11
+  <div class="bg" id="index">
+    <div class="row1">
+      <div class="left">
+        <el-date-picker v-model="value2" type="daterange" align="right" unlink-panels range-separator="至"
+          start-placeholder="开始日期" end-placeholder="结束日期">
+        </el-date-picker>
+        <el-input :placeholder="'可按业务编号、车牌号、客户名查找'" clearable v-model="searchKeyWord" class="search_css"></el-input>
+        <el-button type="primary" size="small" @click="lookup" class="search">查找</el-button>
+      </div>
+      <div class="right">
+        <el-button type="primary" size="small" @click="batchPay()">批量付款</el-button>
+        <el-button type="primary" size="small" @click="exportExcel()">导出</el-button>
+        <el-button type="primary" size="small" @click="handlestatus(1)">盘亏</el-button>
+        <el-button type="primary" size="small" @click="handlestatus(2)">盘盈</el-button>
+      </div>
     </div>
-  </template>
+    <div class="row2">
+      <div class="left">
+        <el-button type="primary" size="small">全部</el-button>
+        <el-button type="primary" size="small">入库记录</el-button>
+        <el-button type="primary" size="small">出库记录</el-button>
+        <el-button type="primary" size="small">已付</el-button>
+        <el-button type="primary" size="small">未付</el-button>
+        <el-button type="primary" size="small">已收</el-button>
+        <el-button type="primary" size="small">未收</el-button>
+      </div>
+      <div class="right">
+        <el-select v-model="value" placeholder="请选择">
+          <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
+          </el-option>
+        </el-select>
+        <div class="text">库存1000吨</div>
+        <div class="text">加权成本200元/吨</div>
+        <el-button type="primary" size="small" @click="makeZero()">归零</el-button>
+      </div>
+    </div>
+    <div>
+      <el-table ref="multipleTable" :data="tableData" tooltip-effect="dark" style="width: 100%"
+        @selection-change="handleSelectionChange" class="table">
+        <el-table-column type="selection" width="55">
+        </el-table-column>
+        <el-table-column label="业务编号" width="120">
+          <template slot-scope="scope">{{ scope.row.date }}</template>
+        </el-table-column>
+        <el-table-column prop="name" label="仓位"></el-table-column>
+        <el-table-column prop="address" label="类型" show-overflow-tooltip>
+        </el-table-column>
+        <el-table-column prop="address" label="车牌号" show-overflow-tooltip>
+        </el-table-column>
+        <el-table-column prop="address" label="客户" show-overflow-tooltip>
+          <template slot-scope="scope"> 
+            <div v-if="true" style="color:cornflowerblue"  @click="customerClick(scope.row)">123</div>
+            <div v-else>456</div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="address" label="货名" show-overflow-tooltip>
+        </el-table-column>
+        <el-table-column prop="address" label="毛重（吨）" show-overflow-tooltip>
+        </el-table-column>
+        <el-table-column prop="address" label="皮重（吨）" show-overflow-tooltip>
+        </el-table-column>
+        <el-table-column prop="address" label="净重（吨）" show-overflow-tooltip>
+        </el-table-column>
+        <el-table-column prop="address" label="容重（克/升）" show-overflow-tooltip>
+        </el-table-column>
+        <el-table-column prop="address" label="水分（%）" show-overflow-tooltip>
+        </el-table-column>
+        <el-table-column prop="address" label="更多指标" show-overflow-tooltip>
+        </el-table-column>
+        <el-table-column prop="address" label="单价（元/吨）" show-overflow-tooltip>
+        </el-table-column>
+        <el-table-column prop="address" label="粮款（元）" show-overflow-tooltip>
+        </el-table-column>
+        <el-table-column prop="address" label="备注" show-overflow-tooltip>
+        </el-table-column>
+        <el-table-column prop="address" label="收款状态" show-overflow-tooltip>
+        </el-table-column>
+        <el-table-column prop="address" label="附件" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <img width="18" height="20" style="vertical-align: text-top; position: relative; top: -1px"
+              src="../../../public/img/fujian.png" @click="fujian(scope.row)" alt="" />
+            <span v-if="scope.row.addressUrlArray != null">
+              {{
+                scope.row.addressUrlArray.length == 0
+                ? ''
+                : scope.row.addressUrlArray.length
+              }}
+            </span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="address" label="操作" show-overflow-tooltip>
+          <template scope="scope">
+            <span style="color: red;" @click="del(scope.row)">删除</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <div style="text-align: center; padding: 10px">
+      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
+        :page-size="deptCircularPage.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal">
+      </el-pagination>
+      <WinseaContentModal v-model="accessoryTFs" :title="$t('system.noticeCircular.information')"
+        @on-cancel="handleClose">
+        <div v-if="applstatus">
+          <ws-upload ref="upload" :size-limit="size" @onChange="onChange" :comp-id="compId" :appendix-ids="appendixIdss"
+            accept=".jpg, .jpeg, .png, .pdf, .doc, .docx, .zip, .rar"
+            v-hasPermission="`contractManagement.buyContract.buyContractInfo.appl`" />
+        </div>
+        <ws-upload v-else ref="upload" :comp-id="compId" :appendix-ids="appendixIdss" :editable="false"
+          accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
+      </WinseaContentModal>
+    </div>
+    <el-dialog width="320px" title="客户信息" :visible.sync="isShowCustomer" :append-to-body="true" :close="customerclose">
+      <el-form class="customer" label-position="right" label-width="80px">
+        <el-form-item class="customer-item" label="姓名">
+          <el-input  disabled placeholder="请输入身份证号" maxlength="100" size="small" />
+        </el-form-item>
+        <el-form-item class="customer-item" label="现有库存（吨）">
+          <el-input  disabled placeholder="请输入身份证号" maxlength="100" size="small" />
+        </el-form-item>
+        <el-form-item class="customer-item" label="">
+          <el-input  disabled placeholder="请输入身份证号" maxlength="100" size="small" />
+        </el-form-item>
+        <el-form-item class="customer-item" label="开户行">
+          <el-input  disabled placeholder="请输入身份证号" maxlength="100" size="small" />
+        </el-form-item>
+        <el-form-item class="customer-item" label="开户支行">
+          <el-input  disabled placeholder="请输入身份证号" maxlength="100" size="small" />
+        </el-form-item>
+      </el-form>
+      <!-- <div slot="footer" class="dialog-footer">
+        <el-button @click="customerclose">取 消</el-button>
+        <el-button @click="customerConfirm" type='primary'>确 定</el-button>
+      </div> -->
+    </el-dialog>
+    <el-dialog width="320px" :title="inventoryTitle" :visible.sync="isShowInventory" :append-to-body="true" :close="inventoryClose">
+      <el-form class="customer" label-position="right" label-width="80px">
+        <el-form-item class="customer-item" label="姓名">
+          <el-input  disabled placeholder="请输入身份证号" maxlength="100" size="small" />
+        </el-form-item>
+        <el-form-item class="customer-item" label="手机号">
+          <el-input  disabled placeholder="请输入身份证号" maxlength="100" size="small" />
+        </el-form-item>
+        <el-form-item class="customer-item" label="银行卡号">
+          <el-input  disabled placeholder="请输入身份证号" maxlength="100" size="small" />
+        </el-form-item>
+        <el-form-item class="customer-item" label="开户行">
+          <el-input  disabled placeholder="请输入身份证号" maxlength="100" size="small" />
+        </el-form-item>
+        <el-form-item class="customer-item" label="开户支行">
+          <el-input  disabled placeholder="请输入身份证号" maxlength="100" size="small" />
+        </el-form-item>
+      </el-form>
+      <!-- <div slot="footer" class="dialog-footer">
+        <el-button @click="customerclose">取 消</el-button>
+        <el-button @click="customerConfirm" type='primary'>确 定</el-button>
+      </div> -->
+    </el-dialog>
+  </div>
+</template>
   
-  <script>
-  import {
-    gChartsData,
-  } from '@/model/home/index'
-  // import CenterMap from "./center-map.vue";
-  export default {
-    components: {
-    },
-    data() {
-      return {
-       
-      };
-    },
-    filters: {
-      numsFilter(msg) {
-        return msg || 0;
+<script>
+  import WsUpload from '@/components/WsUpload'
+export default {
+  components: {
+  },
+  data() {
+    return {
+      inventoryTitle:'',
+      isShowInventory:false,
+      isShowCustomer:false,
+      compId: localStorage.getItem('ws-pf_compId'),
+      appendixIdss: [],
+      applstatus: false,
+      accessoryTFs: false,
+      deptCircularPage: {},
+      deptBudgetTotal: 0,
+      currentPage: 1,
+      pageSize: 10,
+      tableData: [{
+        date: '2016-05-03',
+        name: '王小虎',
+        address: '上海市普陀区金沙江路 1518 弄'
+      }, {
+        date: '2016-05-02',
+        name: '王小虎',
+        address: '上海市普陀区金沙江路 1518 弄'
+      }, {
+        date: '2016-05-04',
+        name: '王小虎',
+        address: '上海市普陀区金沙江路 1518 弄'
+      }, {
+        date: '2016-05-01',
+        name: '王小虎',
+        address: '上海市普陀区金沙江路 1518 弄'
+      }, {
+        date: '2016-05-08',
+        name: '王小虎',
+        address: '上海市普陀区金沙江路 1518 弄'
+      }, {
+        date: '2016-05-06',
+        name: '王小虎',
+        address: '上海市普陀区金沙江路 1518 弄'
+      }, {
+        date: '2016-05-07',
+        name: '王小虎',
+        address: '上海市普陀区金沙江路 1518 弄'
+      }],
+      multipleSelection: [],
+      options: [{
+        value: '选项1',
+        label: '黄金糕'
+      }, {
+        value: '选项2',
+        label: '双皮奶'
+      }, {
+        value: '选项3',
+        label: '蚵仔煎'
+      }, {
+        value: '选项4',
+        label: '龙须面'
+      }, {
+        value: '选项5',
+        label: '北京烤鸭'
+      }],
+      value: '',
+      searchKeyWord: '',
+      value2: [],
+      pickerOptions: {
+        shortcuts: [{
+          text: '本周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            var thisDay = start.getDay()
+            var thisDate = start.getDate()
+            if (thisDay != 0) {
+              start.setDate(thisDate - thisDay)
+            }
+            picker.$emit('pick', [start, end])
+          },
+        },
+        {
+          text: '本月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setDate(1)
+            picker.$emit('pick', [start, end])
+          },
+        },
+        {
+          text: '本季度',
+          onClick(picker) {
+            var oDate = new Date()
+
+            var thisYear = oDate.getFullYear()
+            var thisMonth = oDate.getMonth() + 1
+
+            var n = Math.ceil(thisMonth / 3) // 季度
+
+            var Month = n * 3 - 1
+
+            var start = new Date(thisYear, Month - 2, 1)
+            var end = new Date()
+
+            picker.$emit('pick', [start, end])
+          },
+        },
+        ],
       },
+    };
+  },
+  created() {
+  },
+  mounted() {
+
+  },
+  beforeDestroy() {
+
+
+  },
+  methods: {
+    exportExcel(){
+      this.$confirm('确定勾选的条目均已付款？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+        }).catch(() => {
+          return false
+        });
     },
-    created() {
+    batchPay(){
+      this.$confirm('确定勾选的条目均已付款？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+        }).catch(() => {
+          return false
+        });
     },
-    mounted() {
-     
-  
+    del(val){
+      this.$confirm('确定删除出入库记录？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+        }).catch(() => {
+          return false
+        });
     },
-    beforeDestroy() {
-   
-      
+    makeZero(){
+      this.$confirm('确定将【我是货名】的库存和成本归零？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+
+          // suspendinstance({
+          //     workflowId: row.workflowId,
+          //     id: row.id
+          //   }).toPromise()
+          //   .then((response) => {
+          //     this.$message({
+          //       type: 'success',
+          //       message: '反结算成功!'
+          //     });
+          //     this.getList()
+          //   })
+        }).catch(() => {
+          return false
+        });
     },
-    methods: {
+    inventoryClose(){
+      this.isShowInventory = false
     },
-  };
-  </script>
-  <style lang="scss" scoped>
-  
-  .bg {
-    width: 100%;
-    height: 100%;
-    padding: 16px 16px 10px 16px;
-    box-sizing: border-box;
-    // background-image: url("../../assets/images/pageBg.png");
-    background-size: cover;
-    background-position: center center;
+    //盘亏盘盈
+    handlestatus(type){
+      console.log(type)
+      if(type==1){
+        this.inventoryTitle = '盘亏'
+      }else{
+      this.inventoryTitle = '盘盈'
+      }
+      this.isShowInventory = true
+    },
+    customerclose(){
+      this.isShowCustomer = false
+    },
+    // 查看客户
+    customerClick(val){
+      this.isShowCustomer = true
+    },
+    onChange() {
+      this.$refs.upload
+        .handleSaveBill()
+        .then(async (response) => {
+          this.deptBudgetList.addressUrl = response
+          this.deptBudgetList.id = this.id
+          this.deptBudgetList.flag = 1
+          editInfo(this.deptBudgetList)
+            .toPromise()
+            .then((response) => {
+              this.accessoryTFs = false
+              this.$message.success('上传成功')
+              this.getList()
+            })
+        })
+        .catch((res) => {
+          EventBus.$emit('error', (JSON.parse(res) || {}).message)
+          this.$refs.upload.clearFiles()
+        })
+    },
+    // 上传附件
+    uploadSuccess(data, files, url) {
+      console.log(data, files, url)
+
+      // this.deptBudgetList.
+      // this.formData.append('files', files)
+      // this.feedbackObj.uploadNameAttachment = data.appendixName
+      // this.feedbackObj.pathUploadAttachment = data.appendixPath
+      // // this.newAppendixs = files
+      // this.onChangeFlag = true
+    },
+    handleClose() {
+      this.dialogViewSpareMoney = false
+    },
+    fujian(row) {
+      this.id = row.id
+      this.accessoryTFs = true
+      this.appendixIdss = row.addressUrl
+      console.log(this.appendixIdss)
+    },
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`)
+      this.pageSize = val
+      // this.getList()
+    },
+    handleCurrentChange(val) {
+      this.currentPage = val
+      console.log(`当前页: ${val}`)
+      this.getList()
+    },
+    toggleSelection(rows) {
+      if (rows) {
+        rows.forEach(row => {
+          this.$refs.multipleTable.toggleRowSelection(row);
+        });
+      } else {
+        this.$refs.multipleTable.clearSelection();
+      }
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    lookup() { },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.bg {
+  width: 100%;
+  height: 100%;
+  padding: 16px 16px 10px 16px;
+  box-sizing: border-box;
+  background-size: cover;
+  background-position: center center;
+
+  .row1 {
+    display: flex;
+    justify-content: space-between;
+
+    .left {
+      display: flex;
+    }
   }
-  
-  </style>
+
+  .row2 {
+    margin-top: 20px;
+    display: flex;
+    justify-content: space-between;
+
+    .right {
+      display: flex;
+      align-items: center;
+
+      .text {
+        margin: 0 10px;
+      }
+    }
+  }
+}
+
+.search,
+.search_css {
+  margin-left: 10px;
+}
+
+.table {
+  margin-top: 20px;
+}
+</style>
   

src/views/setup/component/route.js

@@ -31,14 +31,14 @@ const setup = {
         path: 'warehouseSettings',
         component: () =>
           import(/* webpackChunkName: "applDetail" */ '@/views/setup/warehouseSettings'),
-        name: '仓库设置',
+        name: '仓位设置',
         meta: {
-          title: '仓库设置',
+          title: '仓位设置',
           shortcutEntrance: 'customerFundList',
           module: 'customerMoneyManagement.customerMoney.view',
           permissicon: [],
           keepAlive: true,
-          _title:'仓库设置'
+          _title:'仓位设置'
         },
       },
   ],

src/views/setup/goodsSettings.vue

@@ -1,53 +1,147 @@
 
 <template>
-    <div class="bg" id="index">
-      1发11
+  <div class="bg" id="index">
+    <div class="row1">
+      <div class="right">
+        <el-button type="primary" size="small" @click="add" class="add">添加</el-button>
+      </div>
     </div>
-  </template>
+    <el-table ref="singleTable" :data="goodsList" highlight-current-row style="width: 100%" class="table">
+      <el-table-column type="index" width="50" label="序号">
+      </el-table-column>
+      <el-table-column property="goodsName" label="货名" width="120">
+      </el-table-column>
+      <el-table-column property="storage" label="剩余库存（吨）" width="120">
+      </el-table-column>
+      <el-table-column property="setDefault" label="默认货名">
+        <template scope="scope">
+          <el-checkbox v-model="scope.row.scope">设为默认</el-checkbox>
+        </template>
+      </el-table-column>
+      <el-table-column prop="address" label="操作" show-overflow-tooltip>
+        <template scope="scope">
+          <span style="color: #409EFF;margin-right:5px" @click="edit(scope.row)">编辑</span>
+          <span style="color: red;" @click="del(scope.row)">删除</span>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
+      :page-size="deptCircularPage.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal">
+    </el-pagination>
+    <el-dialog width="320px" :title="goodSNameTitle" :visible.sync="show" :append-to-body="true" :close="inventoryClose">
+      <el-form class="goodsName" label-position="right" label-width="80px">
+        <el-form-item class="customer-item" label="货名">
+          <el-input placeholder="请输入货名" maxlength="100" size="small" v-model="dataObj.goodsName" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="goodsNameConfirm" type='primary'>确 定</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
   
-  <script>
-  import {
-    gChartsData,
-  } from '@/model/home/index'
-  // import CenterMap from "./center-map.vue";
-  export default {
-    components: {
+<script>
+import {
+  speedGoodsList,
+  speedGoodsAdd
+} from '@/model/speedGoods'
+export default {
+  components: {
+  },
+  data() {
+    return {
+      goodSNameTitle:'新增',
+      dataObj: {
+        compId: localStorage.getItem('ws-pf_compId')
+      },
+      deptCircularPage: {},
+      deptBudgetTotal: 0,
+      currentPage: 1,
+      pageSize: 10,
+      show: false,
+      checked: true,
+      goodsList: [],
+    };
+  },
+  filters: {
+    numsFilter(msg) {
+      return msg || 0;
     },
-    data() {
-      return {
-       
-      };
+  },
+  created() {
+    this.getList()
+  },
+  mounted() {
+
+
+  },
+  beforeDestroy() {
+
+
+  },
+  methods: {
+    getList() {
+      speedGoodsList({
+        compId: localStorage.getItem('ws-pf_compId')
+      })
+        .toPromise()
+        .then((response) => {
+          console.log(response)
+          this.deptBudgetTotal = response.total
+          this.goodsList = response
+        })
     },
-    filters: {
-      numsFilter(msg) {
-        return msg || 0;
-      },
+    inventoryClose() {
+      this.show = false
     },
-    created() {
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`)
+      this.pageSize = val
+      // this.getList()
     },
-    mounted() {
-     
-  
+    handleCurrentChange(val) {
+      this.currentPage = val
+      console.log(`当前页: ${val}`)
+      // this.getList()
     },
-    beforeDestroy() {
-   
-      
+    add() {
+      this.show = true
     },
-    methods: {
+    eidt() { },
+    del(val) {
+      this.$confirm('确定删除货名？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+      }).catch(() => {
+        return false
+      });
     },
-  };
-  </script>
-  <style lang="scss" scoped>
-  
-  .bg {
-    width: 100%;
-    height: 100%;
-    padding: 16px 16px 10px 16px;
-    box-sizing: border-box;
-    // background-image: url("../../assets/images/pageBg.png");
-    background-size: cover;
-    background-position: center center;
-  }
-  
-  </style>
+    goodsNameConfirm() {
+      speedGoodsAdd(this.dataObj)
+        .toPromise()
+        .then((response) => {debugger
+          console.log(response)
+        })
+    }
+  },
+};
+</script>
+<style lang="scss" scoped>
+.bg {
+  width: 100%;
+  height: 100%;
+  padding: 16px 16px 10px 16px;
+  box-sizing: border-box;
+  // background-image: url("../../assets/images/pageBg.png");
+  background-size: cover;
+  background-position: center center;
+}
+
+.table {
+  margin-top: 20px;
+}
+</style>
   

src/views/setup/warehouseSettings.vue

@@ -1,53 +1,133 @@
 
 <template>
-    <div class="bg" id="index">
-      1发11
+  <div class="bg" id="index">
+    <div class="row1">
+      <div class="right">
+        <el-button type="primary" size="small" @click="add" class="add">添加</el-button>
+      </div>
     </div>
-  </template>
-  
-  <script>
-  import {
-    gChartsData,
-  } from '@/model/home/index'
-  // import CenterMap from "./center-map.vue";
-  export default {
-    components: {
-    },
-    data() {
-      return {
-       
-      };
-    },
-    filters: {
-      numsFilter(msg) {
-        return msg || 0;
+    <el-table ref="singleTable" :data="speedPositionInfoList" highlight-current-row style="width: 100%" class="table">
+      <el-table-column type="index" width="50"  label="序号">
+      </el-table-column>
+      <el-table-column property="positionNo" label="仓位" width="120">
+      </el-table-column>
+      <el-table-column property="storage" label="剩余库存（吨）" width="120">
+      </el-table-column>
+      <el-table-column prop="address" label="操作" show-overflow-tooltip>
+        <template scope="scope">
+          <span style="color: #409EFF;margin-right:5px" @click="edit(scope.row)">编辑</span>
+          <span style="color: red;" @click="del(scope.row)">删除</span>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-dialog width="320px" title="仓位" :visible.sync="show" :append-to-body="true" :close="inventoryClose">
+      <el-form class="customer" label-position="right" label-width="80px">
+        <el-form-item class="customer-item" label="仓位">
+          <el-input  placeholder="输入仓位号，1-10个字符" maxlength="10" size="small" v-model="dataObj.positionNo"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="confirm" type='primary'>确 定</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+
+import {
+  speedPositionInfoList,
+  speedPositionInfoAdd
+} from '@/model/speedGoods'
+export default {
+  components: {
+  },
+  data() {
+    return {
+      dataObj: {
+        compId: localStorage.getItem('ws-pf_compId')
       },
+      show:false,
+      checked:true,
+      speedPositionInfoList: [],
+    };
+  },
+  created() {
+    this.getList()
+  },
+  mounted() {
+   
+
+  },
+  beforeDestroy() {
+ 
+    
+  },
+  methods: {
+    confirm(){
+      speedPositionInfoAdd(this.dataObj)
+        .toPromise()
+        .then((response) => {
+          console.log(response)
+          if(response.code==200){
+            this.$message.success('提交成功！')
+            this.show = false
+            this.getList()
+          }
+        })
     },
-    created() {
-    },
-    mounted() {
-     
-  
+    getList(){
+      speedPositionInfoList({
+        compId: localStorage.getItem('ws-pf_compId')
+      })
+        .toPromise()
+        .then((response) => {
+          console.log(response)
+          this.speedPositionInfoList = response
+        })
     },
-    beforeDestroy() {
-   
-      
+    inventoryClose(){
+      this.show = false
     },
-    methods: {
+    handleSizeChange(val) {
+    console.log(`每页 ${val} 条`)
+    this.pageSize = val
+    // this.getList()
+  },
+  handleCurrentChange(val) {
+    this.currentPage = val
+    console.log(`当前页: ${val}`)
+    // this.getList()
+  },
+    add(){
+      this.show = true
     },
-  };
-  </script>
-  <style lang="scss" scoped>
-  
-  .bg {
-    width: 100%;
-    height: 100%;
-    padding: 16px 16px 10px 16px;
-    box-sizing: border-box;
-    // background-image: url("../../assets/images/pageBg.png");
-    background-size: cover;
-    background-position: center center;
-  }
-  
-  </style>
-  
+    eidt(){},
+    del(val) {
+    this.$confirm('确定删除货名？', '提示', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning'
+    }).then(() => {
+    }).catch(() => {
+      return false
+    });
+  },
+  },
+};
+</script>
+<style lang="scss" scoped>
+
+.bg {
+  width: 100%;
+  height: 100%;
+  padding: 16px 16px 10px 16px;
+  box-sizing: border-box;
+  // background-image: url("../../assets/images/pageBg.png");
+  background-size: cover;
+  background-position: center center;
+}
+.table {
+  margin-top: 20px;
+}
+</style>