Browse Source

首页等基本样式,弹窗未修改

caojunjie 4 năm trước cách đây
mục cha
commit
f51283617b

+ 1 - 41
src/views/basicdata/contact/index.vue

@@ -1,15 +1,6 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="对应corps 的f_id" prop="fPid">
-        <el-input
-          v-model="queryParams.fPid"
-          placeholder="请输入对应corps 的f_id"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="编号" prop="fNo">
         <el-input
           v-model="queryParams.fNo"
@@ -46,33 +37,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="职务" prop="fDuty">
-        <el-input
-          v-model="queryParams.fDuty"
-          placeholder="请输入职务"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="邮箱" prop="fEmail">
-        <el-input
-          v-model="queryParams.fEmail"
-          placeholder="请输入邮箱"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="微信" prop="fWx">
-        <el-input
-          v-model="queryParams.fWx"
-          placeholder="请输入微信"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="状态" prop="fStatus">
         <el-select v-model="queryParams.fStatus" placeholder="请选择状态" clearable size="small">
           <el-option label="请选择字典生成" value="" />
@@ -129,17 +93,13 @@
     <el-table v-loading="loading" :data="contactList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="状态" align="center" prop="tId" />
-      <el-table-column label="对应corps 的f_id" align="center" prop="fPid" />
       <el-table-column label="编号" align="center" prop="fNo" />
       <el-table-column label="名称" align="center" prop="fName" />
       <el-table-column label="英文名称" align="center" prop="fEname" />
       <el-table-column label="电话" align="center" prop="fTel" />
-      <el-table-column label="职务" align="center" prop="fDuty" />
-      <el-table-column label="邮箱" align="center" prop="fEmail" />
-      <el-table-column label="微信" align="center" prop="fWx" />
       <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="100">
         <template slot-scope="scope">
           <el-button
             size="mini"

+ 189 - 50
src/views/basicdata/corps/index.vue

@@ -1,7 +1,25 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-
+      <el-form-item label="客户类别" prop="fTypeid">
+        <el-select v-model="queryParams.fTypeid" placeholder="请选择客户类别" clearable size="small">
+          <el-option
+            v-for="dict in fTypeidOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="编号" prop="fNo">
+        <el-input
+          v-model="queryParams.fNo"
+          placeholder="请输入编号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="名称" prop="fName">
         <el-input
           v-model="queryParams.fName"
@@ -11,10 +29,79 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="状态默认" prop="fStatus">
-        <el-select v-model="queryParams.fStatus" placeholder="请选择状态默认 T ,正常T 停用F 下拉选择" clearable size="small">
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
+      <el-form-item label="简称" prop="fCname">
+        <el-input
+          v-model="queryParams.fCname"
+          placeholder="请输入简称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="英文名称" prop="fEname">
+        <el-input
+          v-model="queryParams.fEname"
+          placeholder="请输入英文名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="电话" prop="fTel">
+        <el-input
+          v-model="queryParams.fTel"
+          placeholder="请输入电话"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
+      <el-form-item label="录入人" prop="fTel">
+        <el-input
+          v-model="queryParams.fTel"
+          placeholder="请输入录入人"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
+      <el-form-item label="录入时间" prop="fContractb">
+        <el-date-picker clearable size="small" style="width: 200px"
+                        v-model="queryParams.fContractb"
+                        type="date"
+                        value-format="yyyy-MM-dd"
+                        placeholder="选择合同起">
+        </el-date-picker>
+      </el-form-item>
+
+      <el-form-item label="修改人" prop="fTel">
+        <el-input
+          v-model="queryParams.fTel"
+          placeholder="请输入修改人"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
+      <el-form-item label="修改时间" prop="fContracte">
+        <el-date-picker clearable size="small" style="width: 200px"
+                        v-model="queryParams.fContracte"
+                        type="date"
+                        value-format="yyyy-MM-dd"
+                        placeholder="选择合同至">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="筛选状态" prop="fStatus">
+        <el-input
+          v-model="queryParams.fStatus"
+          placeholder="请选择状态"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
       </el-form-item>
       <el-form-item>
         <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -68,18 +155,26 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="客户类别" align="center" prop="fTypeid" :formatter="fTypeidFormat" />
       <el-table-column label="编号" align="center" prop="fNo" />
-      <el-table-column label="简称" align="center" prop="fCname" />
       <el-table-column label="名称" align="center" prop="fName" />
+      <el-table-column label="简称" align="center" prop="fCname" />
       <el-table-column label="英文名称" align="center" prop="fEname" />
-      <el-table-column label="地址" align="center" prop="fAddr" />
-      <el-table-column label="开票地址" align="center" prop="fInvaddr" />
-      <el-table-column label="本位币账号" align="center" prop="fBankno" />
-      <el-table-column label="本位币银行" align="center" prop="fBankname" />
-      <el-table-column label="外币账号" align="center" prop="fUbankno" />
-      <el-table-column label="外币银行" align="center" prop="fUbankname" />
-      <el-table-column label="状态默认 T ,正常T 停用F 下拉选择" 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" prop="fTel" />
+
+      <el-table-column label="录入人" align="center" prop="createBy" />
+      <el-table-column label="录入时间" align="center" prop="createTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.fContractb, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="修改人" align="center" prop="updateBy" />
+      <el-table-column label="修改时间" align="center" prop="updateTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.fContracte, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="状态" align="center" prop="fStatus" />
+      <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">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -108,7 +203,7 @@
     />
 
     <!-- 添加或修改客户详情对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="766px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="客户类别" prop="fTypeid">
           <el-select v-model="form.fTypeid" placeholder="请选择客户类别">
@@ -121,52 +216,59 @@
           </el-select>
         </el-form-item>
         <el-form-item label="编号" prop="fNo">
-          <el-input v-model="form.fNo" placeholder="请输入编号" />
-        </el-form-item>
-        <el-form-item label="简称" prop="fCname">
-          <el-input v-model="form.fCname" placeholder="请输入简称" />
+          <el-input v-model="form.fNo" style="width: 200px" placeholder="请输入编号" />
         </el-form-item>
         <el-form-item label="名称" prop="fName">
-          <el-input v-model="form.fName" placeholder="请输入名称" />
+          <el-input v-model="form.fName" style="width: 200px" placeholder="请输入名称" />
+        </el-form-item>
+        <el-form-item label="简称" prop="fCname">
+          <el-input v-model="form.fCname" style="width: 200px" placeholder="请输入简称" />
         </el-form-item>
         <el-form-item label="英文名称" prop="fEname">
-          <el-input v-model="form.fEname" placeholder="请输入英文名称" />
+          <el-input v-model="form.fEname" style="width: 200px" placeholder="请输入英文名称" />
         </el-form-item>
         <el-form-item label="电话" prop="fTel">
-          <el-input v-model="form.fTel" placeholder="请输入电话" />
+          <el-input v-model="form.fTel" style="width: 200px" placeholder="请输入电话" />
         </el-form-item>
         <el-form-item label="传真" prop="fFax">
-          <el-input v-model="form.fFax" placeholder="请输入传真" />
+          <el-input v-model="form.fFax" style="width: 200px" placeholder="请输入传真" />
         </el-form-item>
         <el-form-item label="邮箱" prop="fEmail">
-          <el-input v-model="form.fEmail" placeholder="请输入邮箱" />
+          <el-input v-model="form.fEmail" style="width: 200px" placeholder="请输入邮箱" />
         </el-form-item>
         <el-form-item label="联系人" prop="fManage">
-          <el-input v-model="form.fManage" placeholder="请输入联系人" />
+          <el-input v-model="form.fManage" style="width: 200px" placeholder="请输入联系人" />
         </el-form-item>
         <el-form-item label="地址" prop="fAddr">
-          <el-input v-model="form.fAddr" placeholder="请输入地址" />
+          <el-input v-model="form.fAddr" style="width: 200px" placeholder="请输入地址" />
         </el-form-item>
         <el-form-item label="英文地址" prop="fEaddr">
-          <el-input v-model="form.fEaddr" placeholder="请输入英文地址" />
+          <el-input v-model="form.fEaddr" style="width: 200px" placeholder="请输入英文地址" />
         </el-form-item>
         <el-form-item label="规模" prop="fScale">
-          <el-input v-model="form.fScale" placeholder="请输入规模" />
+          <el-input v-model="form.fScale" style="width: 200px" placeholder="请输入规模" />
         </el-form-item>
         <el-form-item label="省" prop="fProvince">
-          <el-input v-model="form.fProvince" placeholder="请输入省" />
+          <el-input v-model="form.fProvince" style="width: 200px" placeholder="请输入省" />
         </el-form-item>
         <el-form-item label="市" prop="fCity">
-          <el-input v-model="form.fCity" placeholder="请输入市" />
+          <el-input v-model="form.fCity" style="width: 200px" placeholder="请输入市" />
         </el-form-item>
         <el-form-item label="结算表票结、月结" prop="fStltypeid">
-          <el-input v-model="form.fStltypeid" placeholder="请输入结算表票结、月结" />
+          <el-select v-model="form.fStltypeid" style="width: 200px" placeholder="请选择结算表票结、月结">
+            <el-option
+              v-for="dict in fStltypeidOptions"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="parseInt(dict.dictValue)"
+            ></el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="结费天数" prop="fStldays">
-          <el-input v-model="form.fStldays" placeholder="请输入结费天数" />
+          <el-input v-model="form.fStldays" style="width: 200px" placeholder="请输入结费天数" />
         </el-form-item>
         <el-form-item label="合同号" prop="fContractno">
-          <el-input v-model="form.fContractno" placeholder="请输入合同号" />
+          <el-input v-model="form.fContractno" style="width: 200px" placeholder="请输入合同号" />
         </el-form-item>
         <el-form-item label="合同起" prop="fContractb">
           <el-date-picker clearable size="small" style="width: 200px"
@@ -185,38 +287,71 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item label="税号" prop="fTax">
-          <el-input v-model="form.fTax" placeholder="请输入税号" />
+          <el-input v-model="form.fTax" style="width: 200px" placeholder="请输入税号" />
         </el-form-item>
         <el-form-item label="开票电话" prop="fInvtel">
-          <el-input v-model="form.fInvtel" placeholder="请输入开票电话" />
+          <el-input v-model="form.fInvtel" style="width: 200px" placeholder="请输入开票电话" />
         </el-form-item>
         <el-form-item label="开票地址" prop="fInvaddr">
-          <el-input v-model="form.fInvaddr" placeholder="请输入开票地址" />
+          <el-input v-model="form.fInvaddr" style="width: 200px" placeholder="请输入开票地址" />
         </el-form-item>
         <el-form-item label="本位币账号" prop="fBankno">
-          <el-input v-model="form.fBankno" placeholder="请输入本位币账号" />
+          <el-input v-model="form.fBankno" style="width: 200px" placeholder="请输入本位币账号" />
         </el-form-item>
         <el-form-item label="本位币银行" prop="fBankname">
-          <el-input v-model="form.fBankname" placeholder="请输入本位币银行" />
+          <el-input v-model="form.fBankname" style="width: 200px" placeholder="请输入本位币银行" />
         </el-form-item>
         <el-form-item label="外币账号" prop="fUbankno">
-          <el-input v-model="form.fUbankno" placeholder="请输入外币账号" />
+          <el-input v-model="form.fUbankno" style="width: 200px" placeholder="请输入外币账号" />
         </el-form-item>
         <el-form-item label="外币银行" prop="fUbankname">
-          <el-input v-model="form.fUbankname" placeholder="请输入外币银行" />
+          <el-input v-model="form.fUbankname" style="width: 200px" placeholder="请输入外币银行" />
         </el-form-item>
-        <el-form-item label="状态默认 T ,正常T 停用F 下拉选择">
-          <el-radio-group v-model="form.fStatus">
-            <el-radio label="1">请选择字典生成</el-radio>
-          </el-radio-group>
+        <el-form-item label="状态" prop="fStatus">
+          <el-input v-model="form.fStatus" style="width: 200px" placeholder="请输入状态默认 T ,正常T 停用F 下拉选择" />
         </el-form-item>
         <el-form-item label="删除状态" prop="delFlag">
-          <el-input v-model="form.delFlag" placeholder="请输入删除状态" />
+          <el-select v-model="form.delFlag" style="width: 200px" placeholder="请选择删除状态">
+            <el-option
+              v-for="dict in delFlagOptions"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="dict.dictValue"
+            ></el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入备注" />
+          <el-input v-model="form.remark" style="width: 200px" placeholder="请输入备注" />
         </el-form-item>
       </el-form>
+      <el-table v-loading="loading" :data="contactList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="状态" align="center" prop="tId" />
+        <el-table-column label="编号" align="center" prop="fNo" />
+        <el-table-column label="名称" align="center" prop="fName" />
+        <el-table-column label="英文名称" align="center" prop="fEname" />
+        <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">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-edit"
+              @click="handleUpdate(scope.row)"
+              v-hasPermi="['basicdata:contact:edit']"
+            >修改</el-button>
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-delete"
+              @click="handleDelete(scope.row)"
+              v-hasPermi="['basicdata:contact:remove']"
+            >删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
@@ -234,6 +369,7 @@
     },
     data() {
       return {
+        contactList:[],
         // 遮罩层
         loading: true,
         // 选中数组
@@ -264,8 +400,8 @@
           pageSize: 10,
           fTypeid: null,
           fNo: null,
-          fCname: null,
           fName: null,
+          fCname: null,
           fEname: null,
           fTel: null,
           fFax: null,
@@ -294,6 +430,9 @@
         form: {},
         // 表单校验
         rules: {
+          fTypeid: [
+            { required: true, message: "客户类别不能为空", trigger: "change" }
+          ],
           fNo: [
             { required: true, message: "编号不能为空", trigger: "blur" }
           ],
@@ -351,8 +490,8 @@
           fId: null,
           fTypeid: null,
           fNo: null,
-          fCname: null,
           fName: null,
+          fCname: null,
           fEname: null,
           fTel: null,
           fFax: null,
@@ -375,7 +514,7 @@
           fBankname: null,
           fUbankno: null,
           fUbankname: null,
-          fStatus: "0",
+          fStatus: null,
           delFlag: null,
           createBy: null,
           createTime: null,

+ 10 - 10
src/views/basicdata/fees/index.vue

@@ -19,8 +19,8 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="费用属性(数据字典)"全部、仓储、海运、空运"" prop="fFeetype">
-        <el-select v-model="queryParams.fFeetype" placeholder="请选择费用属性(数据字典)"全部、仓储、海运、空运"" clearable size="small">
+      <el-form-item label="费用属性" prop="fFeetype">
+        <el-select v-model="queryParams.fFeetype" placeholder="请选择费用属性" clearable size="small">
           <el-option
             v-for="dict in fFeetypeOptions"
             :key="dict.dictValue"
@@ -29,10 +29,10 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="计量单位(数据字典)"对应t_unitfees的f_id"" prop="fFeeunitid">
+      <el-form-item label="计量单位" prop="fFeeunitid">
         <el-input
           v-model="queryParams.fFeeunitid"
-          placeholder="请输入计量单位(数据字典)"对应t_unitfees的f_id""
+          placeholder="请输入计量单位"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
@@ -105,8 +105,8 @@
       <el-table-column label="状态" align="center" prop="fId" />
       <el-table-column label="编号" align="center" prop="fNo" />
       <el-table-column label="名称" align="center" prop="fName" />
-      <el-table-column label="费用属性(数据字典)"全部、仓储、海运、空运"" align="center" prop="fFeetype" :formatter="fFeetypeFormat" />
-      <el-table-column label="计量单位(数据字典)"对应t_unitfees的f_id"" align="center" prop="fFeeunitid" :formatter="fFeeunitidFormat" />
+      <el-table-column label="费用属性" align="center" prop="fFeetype" :formatter="fFeetypeFormat" />
+      <el-table-column label="计量单位" align="center" prop="fFeeunitid" :formatter="fFeeunitidFormat" />
       <el-table-column label="币种" align="center" prop="fCurrency" />
       <el-table-column label="状态" align="center" prop="fStatus" />
       <el-table-column label="备注" align="center" prop="remark" />
@@ -147,8 +147,8 @@
         <el-form-item label="名称" prop="fName">
           <el-input v-model="form.fName" placeholder="请输入名称" />
         </el-form-item>
-        <el-form-item label="费用属性(数据字典)"全部、仓储、海运、空运"" prop="fFeetype">
-          <el-select v-model="form.fFeetype" placeholder="请选择费用属性(数据字典)"全部、仓储、海运、空运"">
+        <el-form-item label="费用属性" prop="fFeetype">
+          <el-select v-model="form.fFeetype" placeholder="请选择费用属性">
             <el-option
               v-for="dict in fFeetypeOptions"
               :key="dict.dictValue"
@@ -157,8 +157,8 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="计量单位(数据字典)"对应t_unitfees的f_id"" prop="fFeeunitid">
-          <el-input v-model="form.fFeeunitid" placeholder="请输入计量单位(数据字典)"对应t_unitfees的f_id"" />
+        <el-form-item label="计量单位" prop="fFeeunitid">
+          <el-input v-model="form.fFeeunitid" placeholder="请输入计量单位"对应t_unitfees的f_id"" />
         </el-form-item>
         <el-form-item label="币种" prop="fCurrency">
           <el-input v-model="form.fCurrency" placeholder="请输入币种" />

+ 14 - 23
src/views/basicdata/goods/index.vue

@@ -1,15 +1,6 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="存储id 显示名称 下拉选择类别,一个商品名称对应一个类别,对应t_goodtype的f_id" prop="fTypeid">
-        <el-input
-          v-model="queryParams.fTypeid"
-          placeholder="请输入存储id 显示名称 下拉选择类别,一个商品名称对应一个类别,对应t_goodtype的f_id"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="编号" prop="fNo">
         <el-input
           v-model="queryParams.fNo"
@@ -46,10 +37,10 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="包装规格,20、25、35、50、850,kg" prop="fPackagespecs">
+      <el-form-item label="包装规格" prop="fPackagespecs">
         <el-input
           v-model="queryParams.fPackagespecs"
-          placeholder="请输入包装规格,20、25、35、50、850,kg"
+          placeholder="请输入包装规格"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
@@ -73,10 +64,10 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="包装类型,存储id 显示名称 下拉选择类型,一个商品名称对应一个包装类型,对应t_package的f_id" prop="fPackageid">
+      <el-form-item label="包装类型" prop="fPackageid">
         <el-input
           v-model="queryParams.fPackageid"
-          placeholder="请输入包装类型,存储id 显示名称 下拉选择类型,一个商品名称对应一个包装类型,对应t_package的f_id"
+          placeholder="请输入包装类型"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
@@ -138,18 +129,18 @@
     <el-table v-loading="loading" :data="goodsList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="状态" align="center" prop="fId" />
-      <el-table-column label="存储id 显示名称 下拉选择类别,一个商品名称对应一个类别,对应t_goodtype的f_id" align="center" prop="fTypeid" />
+      <el-table-column label="存储id" align="center" prop="fTypeid" />
       <el-table-column label="编号" align="center" prop="fNo" />
       <el-table-column label="名称" align="center" prop="fName" />
       <el-table-column label="英文名称" align="center" prop="fEnam" />
       <el-table-column label="规格" align="center" prop="fSpecs" />
-      <el-table-column label="包装规格,20、25、35、50、850,kg" align="center" prop="fPackagespecs" />
+      <el-table-column label="包装规格" align="center" prop="fPackagespecs" />
       <el-table-column label="颜色" align="center" prop="fColor" />
       <el-table-column label="海关编码" align="center" prop="fHscode" />
-      <el-table-column label="包装类型,存储id 显示名称 下拉选择类型,一个商品名称对应一个包装类型,对应t_package的f_id" align="center" prop="fPackageid" />
+      <el-table-column label="包装类型" align="center" prop="fPackageid" />
       <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="100">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -180,8 +171,8 @@
     <!-- 添加或修改商品详情对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="存储id 显示名称 下拉选择类别,一个商品名称对应一个类别,对应t_goodtype的f_id" prop="fTypeid">
-          <el-input v-model="form.fTypeid" placeholder="请输入存储id 显示名称 下拉选择类别,一个商品名称对应一个类别,对应t_goodtype的f_id" />
+        <el-form-item label="存储id" prop="fTypeid">
+          <el-input v-model="form.fTypeid" placeholder="请输入存储id" />
         </el-form-item>
         <el-form-item label="编号" prop="fNo">
           <el-input v-model="form.fNo" placeholder="请输入编号" />
@@ -195,8 +186,8 @@
         <el-form-item label="规格" prop="fSpecs">
           <el-input v-model="form.fSpecs" placeholder="请输入规格" />
         </el-form-item>
-        <el-form-item label="包装规格,20、25、35、50、850,kg" prop="fPackagespecs">
-          <el-input v-model="form.fPackagespecs" placeholder="请输入包装规格,20、25、35、50、850,kg" />
+        <el-form-item label="包装规格" prop="fPackagespecs">
+          <el-input v-model="form.fPackagespecs" placeholder="请输入包装规格" />
         </el-form-item>
         <el-form-item label="颜色" prop="fColor">
           <el-input v-model="form.fColor" placeholder="请输入颜色" />
@@ -204,8 +195,8 @@
         <el-form-item label="海关编码" prop="fHscode">
           <el-input v-model="form.fHscode" placeholder="请输入海关编码" />
         </el-form-item>
-        <el-form-item label="包装类型,存储id 显示名称 下拉选择类型,一个商品名称对应一个包装类型,对应t_package的f_id" prop="fPackageid">
-          <el-input v-model="form.fPackageid" placeholder="请输入包装类型,存储id 显示名称 下拉选择类型,一个商品名称对应一个包装类型,对应t_package的f_id" />
+        <el-form-item label="包装类型" prop="fPackageid">
+          <el-input v-model="form.fPackageid" placeholder="请输入包装类型" />
         </el-form-item>
         <el-form-item label="状态">
           <el-radio-group v-model="form.fStatus">

+ 247 - 505
src/views/index.vue

@@ -1,534 +1,276 @@
 <template>
   <div class="app-container home">
-    <el-row :gutter="20">
-      <el-col :sm="24" :lg="24">
-        <blockquote class="text-warning" style="font-size: 14px">
-          神经病在此,神经病在此,神经病在此,神经病在此,神经病在此,神经病在此,神经病在此
-          <br />
-          <el-link
-            href="https://www.aliyun.com/minisite/goods?userCode=brki8iof"
-            type="primary"
-            target="_blank"
-            >https://www.aliyun.com/minisite/goods?userCode=brki8iof</el-link
-          >
-          <br />
-          领取腾讯云通用云产品2860优惠券
-          <br />
-          <el-link
-            href="https://cloud.tencent.com/redirect.php?redirect=1025&cps_key=198c8df2ed259157187173bc7f4f32fd&from=console"
-            type="primary"
-            target="_blank"
-            >https://cloud.tencent.com/redirect.php?redirect=1025&cps_key=198c8df2ed259157187173bc7f4f32fd&from=console</el-link
-          >
-          <br />
-          阿里云服务器折扣区
-          <el-link href="http://aly.ruoyi.vip" type="primary" target="_blank"
-            >>☛☛点我进入☚☚</el-link
-          >
-          &nbsp;&nbsp;&nbsp; 腾讯云服务器秒杀区
-          <el-link href="http://txy.ruoyi.vip" type="primary" target="_blank"
-            >>☛☛点我进入☚☚</el-link
-          ><br />
-          <h4 class="text-danger">
-            云产品通用红包,可叠加官网常规优惠使用。(仅限新用户)
-          </h4>
-        </blockquote>
-
-        <hr />
-      </el-col>
-    </el-row>
-    <el-row :gutter="20">
-      <el-col :sm="24" :lg="12" style="padding-left: 20px">
-        <h2>若依后台管理框架</h2>
-        <p>
-          一直想做一款后台管理系统,看了很多优秀的开源项目但是发现没有合适自己的。于是利用空闲休息时间开始自己写一套后台系统。如此有了若依管理系统。,她可以用于所有的Web应用程序,如网站管理后台,网站会员中心,CMS,CRM,OA等等,当然,您也可以对她进行深度定制,以做出更强系统。所有前端后台代码封装过后十分精简易上手,出错概率低。同时支持移动客户端访问。系统会陆续更新一些实用功能。
-        </p>
-        <p>
-          <b>当前版本:</b> <span>v{{ version }}</span>
-        </p>
-        <p>
-          <el-tag type="danger">&yen;免费开源</el-tag>
-        </p>
-        <p>
-          <el-button
-            type="primary"
-            size="mini"
-            icon="el-icon-cloudy"
-            plain
-            @click="goTarget('https://gitee.com/y_project/RuoYi-Vue')"
-            >访问码云</el-button
-          >
-          <el-button
-            size="mini"
-            icon="el-icon-s-home"
-            plain
-            @click="goTarget('http://ruoyi.vip')"
-            >访问主页</el-button
-          >
-        </p>
-      </el-col>
-
-      <el-col :sm="24" :lg="12" style="padding-left: 50px">
-        <el-row>
-          <el-col :span="12">
-            <h2>技术选型</h2>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="6">
-            <h4>后端技术</h4>
-            <ul>
-              <li>SpringBoot</li>
-              <li>Spring Security</li>
-              <li>JWT</li>
-              <li>MyBatis</li>
-              <li>Druid</li>
-              <li>Fastjson</li>
-              <li>...</li>
-            </ul>
-          </el-col>
-          <el-col :span="6">
-            <h4>前端技术</h4>
-            <ul>
-              <li>Vue</li>
-              <li>Vuex</li>
-              <li>Element-ui</li>
-              <li>Axios</li>
-              <li>Sass</li>
-              <li>Quill</li>
-              <li>...</li>
-            </ul>
-          </el-col>
-        </el-row>
-      </el-col>
-    </el-row>
-    <el-divider />
-    <el-row :gutter="20">
-      <el-col :xs="24" :sm="24" :md="12" :lg="8">
-        <el-card class="update-log">
-          <div slot="header" class="clearfix">
-            <span>联系信息</span>
-          </div>
-          <div class="body">
-            <p>
-              <i class="el-icon-s-promotion"></i> 官网:<el-link
-                href="http://www.ruoyi.vip"
-                target="_blank"
-                >http://www.ruoyi.vip</el-link
-              >
-            </p>
-            <p>
-              <i class="el-icon-user-solid"></i> QQ群:<s>满937441</s>
-              <s>满887144332</s> <s>满180251782</s>
-              <a href="https://jq.qq.com/?_wv=1027&k=4WWwqNxN" target="_blank"
-                > 104180207</a
-              >
-            </p>
-            <p>
-              <i class="el-icon-chat-dot-round"></i> 微信:<a
-                href="javascript:;"
-                >/ *若依</a
-              >
-            </p>
-            <p>
-              <i class="el-icon-money"></i> 支付宝:<a
-                href="javascript:;"
-                class="支付宝信息"
-                >/ *若依</a
-              >
-            </p>
-          </div>
-        </el-card>
-      </el-col>
-      <el-col :xs="24" :sm="24" :md="12" :lg="8">
-        <el-card class="update-log">
-          <div slot="header" class="clearfix">
-            <span>更新日志</span>
-          </div>
-          <el-collapse accordion>
-            <el-collapse-item title="v3.2.1 - 2020-11-18">
-              <ol>
-                <li>阻止任意文件下载漏洞</li>
-                <li>代码生成支持上传控件</li>
-                <li>新增图片上传组件</li>
-                <li>调整默认首页</li>
-                <li>升级druid到最新版本v1.2.2</li>
-                <li>mapperLocations配置支持分隔符</li>
-                <li>权限信息调整</li>
-                <li>调整sql默认时间</li>
-                <li>解决代码生成没有bit类型的问题</li>
-                <li>升级pagehelper到最新版1.3.0</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.2.0 - 2020-10-10">
-              <ol>
-                <li>升级springboot版本到2.1.17 提升安全性</li>
-                <li>升级oshi到最新版本v5.2.5</li>
-                <li>升级druid到最新版本v1.2.1</li>
-                <li>升级jjwt到版本0.9.1</li>
-                <li>升级fastjson到最新版1.2.74</li>
-                <li>修改sass为node-sass,避免el-icon图标乱码</li>
-                <li>代码生成支持同步数据库</li>
-                <li>代码生成支持富文本控件</li>
-                <li>代码生成页面时不忽略remark属性</li>
-                <li>代码生成添加select必填选项</li>
-                <li>Excel导出类型NUMERIC支持精度浮点类型</li>
-                <li>Excel导出targetAttr优化获取值,防止get方法不规范</li>
-                <li>Excel注解支持自动统计数据总和</li>
-                <li>Excel注解支持设置BigDecimal精度&舍入规则</li>
-                <li>菜单&数据权限新增(展开/折叠 全选/全不选 父子联动)</li>
-                <li>允许用户分配到部门父节点</li>
-                <li>菜单新增是否缓存keep-alive</li>
-                <li>表格操作列间距调整</li>
-                <li>限制系统内置参数不允许删除</li>
-                <li>富文本组件优化,支持自定义高度&图片冲突问题</li>
-                <li>富文本工具栏样式对齐</li>
-                <li>导入excel整形值校验优化</li>
-                <li>修复页签关闭所有时固定标签路由不刷新问题</li>
-                <li>表单构建布局型组件新增按钮</li>
-                <li>左侧菜单文字过长显示省略号</li>
-                <li>修正根节点为子部门时,树状结构显示问题</li>
-                <li>修正调用目标字符串最大长度</li>
-                <li>修正菜单提示信息错误</li>
-                <li>修正定时任务执行一次权限标识</li>
-                <li>修正数据库字符串类型nvarchar</li>
-                <li>优化递归子节点</li>
-                <li>优化数据权限判断</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-
-            <el-collapse-item title="v3.1.0 - 2020-08-13">
-              <ol>
-                <li>表格工具栏右侧添加刷新&显隐查询组件</li>
-                <li>后端支持CORS跨域请求</li>
-                <li>代码生成支持选择上级菜单</li>
-                <li>代码生成支持自定义路径</li>
-                <li>代码生成支持复选框</li>
-                <li>Excel导出导入支持dictType字典类型</li>
-                <li>Excel支持分割字符串组内容</li>
-                <li>验证码类型支持(数组计算、字符验证)</li>
-                <li>升级vue-cli版本到4.4.4</li>
-                <li>修改 node-sass 为 dart-sass</li>
-                <li>表单类型为Integer/Long设置整形默认值</li>
-                <li>代码生成器默认mapper路径与默认mapperScan路径不一致</li>
-                <li>优化防重复提交拦截器</li>
-                <li>优化上级菜单不能选择自己</li>
-                <li>修复角色的权限分配后,未实时生效问题</li>
-                <li>修复在线用户日志记录类型</li>
-                <li>修复富文本空格和缩进保存后不生效问题</li>
-                <li>修复在线用户判断逻辑</li>
-                <li>唯一限制条件只返回单条数据</li>
-                <li>添加获取当前的环境配置方法</li>
-                <li>超时登录后页面跳转到首页</li>
-                <li>全局异常状态汉化拦截处理</li>
-                <li>HTML过滤器改为将html转义</li>
-                <li>检查字符支持小数点&降级改成异常提醒</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-
-            <el-collapse-item title="v3.0.0 - 2020-07-20">
-              <ol>
-                <li>单应用调整为多模块项目</li>
-                <li>升级element-ui版本到2.13.2</li>
-                <li>删除babel,提高编译速度。</li>
-                <li>新增菜单默认主类目</li>
-                <li>编码文件名修改为uuid方式</li>
-                <li>定时任务cron表达式验证</li>
-                <li>角色权限修改时已有权限未自动勾选异常修复</li>
-                <li>防止切换权限用户后登录出现404</li>
-                <li>Excel支持sort导出排序</li>
-                <li>创建用户不允许选择超级管理员角色</li>
-                <li>修复代码生成导入表结构出现异常页面不提醒问题</li>
-                <li>修复代码生成点击多次表修改数据不变化的问题</li>
-                <li>修复头像上传成功二次打开无法改变裁剪框大小和位置问题</li>
-                <li>修复布局为small者mini用户表单显示错位问题</li>
-                <li>修复热部署导致的强换异常问题</li>
-                <li>修改用户管理复选框宽度,防止部分浏览器出现省略号</li>
-                <li>IpUtils工具,清除Xss特殊字符,防止Xff注入攻击</li>
-                <li>生成domain 如果是浮点型 统一用BigDecimal</li>
-                <li>定时任务调整label-width,防止部署出现错位</li>
-                <li>调整表头固定列默认样式</li>
-                <li>代码生成模板调整,字段为String并且必填则加空串条件</li>
-                <li>代码生成字典Integer/Long使用parseInt</li>
-                <li>
-                  修复dict_sort不可update为0的问题&查询返回增加dict_sort升序排序
-                </li>
-                <li>修正岗位导出权限注解</li>
-                <li>禁止加密密文返回前端</li>
-                <li>修复代码生成页面中的查询条件创建时间未生效的问题</li>
-                <li>修复首页搜索菜单外链无法点击跳转问题</li>
-                <li>修复菜单管理选择图标,backspace删除时不过滤数据</li>
-                <li>用户管理部门分支节点不可检查&显示计数</li>
-                <li>数据范围过滤属性调整</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-
-            <el-collapse-item title="v2.3.0 - 2020-06-01">
-              <ol>
-                <li>升级fastjson到最新版1.2.70 修复高危安全漏洞</li>
-                <li>dev启动默认打开浏览器</li>
-                <li>vue-cli使用默认source-map</li>
-                <li>slidebar eslint报错优化</li>
-                <li>当tags-view滚动关闭右键菜单</li>
-                <li>字典管理添加缓存读取</li>
-                <li>参数管理支持缓存操作</li>
-                <li>支持一级菜单(和主页同级)在main区域显示</li>
-                <li>限制外链地址必须以http(s)开头</li>
-                <li>tagview & sidebar 主题颜色与element ui(全局)同步</li>
-                <li>修改数据源类型优先级,先根据方法,再根据类</li>
-                <li>支持是否需要设置token属性,自定义返回码消息。</li>
-                <li>swagger请求前缀加入配置。</li>
-                <li>登录地点设置内容过长则隐藏显示</li>
-                <li>修复定时任务执行一次按钮后不提示消息问题</li>
-                <li>修改上级部门(选择项排除本身和下级)</li>
-                <li>通用http发送方法增加参数 contentType 编码类型</li>
-                <li>更换IP地址查询接口</li>
-                <li>修复页签变量undefined</li>
-                <li>添加校验部门包含未停用的子部门</li>
-                <li>修改定时任务详情下次执行时间日期显示错误</li>
-                <li>角色管理查询设置默认排序字段</li>
-                <li>swagger添加enable参数控制是否启用</li>
-                <li>只对json类型请求构建可重复读取inputStream的request</li>
-                <li>修改代码生成字典字段int类型没有自动选中问题</li>
-                <li>vuex用户名取值修正</li>
-                <li>表格树模板去掉多余的)</li>
-                <li>代码生成序号修正</li>
-                <li>全屏情况下不调整上外边距</li>
-                <li>代码生成Date字段添加默认格式</li>
-                <li>用户管理角色选择权限控制</li>
-                <li>修复路由懒加载报错问题</li>
-                <li>模板sql.vm添加菜单状态</li>
-                <li>设置用户名称不能修改</li>
-                <li>dialog添加append-to-body属性,防止ie遮罩</li>
-                <li>菜单区分状态和显示隐藏功能</li>
-                <li>升级fastjson到最新版1.2.68 修复安全加固</li>
-                <li>修复代码生成如果选择字典类型缺失逗号问题</li>
-                <li>登录请求params更换为data,防止暴露url</li>
-                <li>日志返回时间格式处理</li>
-                <li>添加handle控制允许拖动的元素</li>
-                <li>布局设置点击扩大范围</li>
-                <li>代码生成列属性排序查询</li>
-                <li>代码生成列支持拖动排序</li>
-                <li>修复时间格式不支持ios问题</li>
-                <li>表单构建添加父级class,防止冲突</li>
-                <li>定时任务并发属性修正</li>
-                <li>角色禁用&菜单隐藏不查询权限</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-
-            <el-collapse-item title="v2.2.0 - 2020-03-18">
-              <ol>
-                <li>系统监控新增定时任务功能</li>
-                <li>添加一个打包Web工程bat</li>
-                <li>修复页签鼠标滚轮按下的时候,可以关闭不可关闭的tag</li>
-                <li>修复点击退出登录有时会无提示问题</li>
-                <li>修复防重复提交注解无效问题</li>
-                <li>修复通知公告批量删除异常问题</li>
-                <li>添加菜单时路由地址必填限制</li>
-                <li>代码生成字段描述可编辑</li>
-                <li>修复用户修改个人信息导致缓存不过期问题</li>
-                <li>个人信息创建时间获取正确属性值</li>
-                <li>操作日志详细显示正确类型</li>
-                <li>导入表单击行数据时选中对应的复选框</li>
-                <li>批量替换表前缀逻辑调整</li>
-                <li>固定重定向路径表达式</li>
-                <li>升级element-ui版本到2.13.0</li>
-                <li>操作日志排序调整</li>
-                <li>修复charts切换侧边栏或者缩放窗口显示bug</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-
-            <el-collapse-item title="v2.1.0 - 2020-02-24">
-              <ol>
-                <li>新增表单构建</li>
-                <li>代码生成支持树表结构</li>
-                <li>新增用户导入</li>
-                <li>修复动态加载路由页面刷新问题</li>
-                <li>修复地址开关无效问题</li>
-                <li>汉化错误提示页面</li>
-                <li>代码生成已知问题修改</li>
-                <li>修复多数据源下配置关闭出现异常处理</li>
-                <li>添加HTML过滤器,用于去除XSS漏洞隐患</li>
-                <li>修复上传头像控制台出现异常</li>
-                <li>修改用户管理分页不正确的问题</li>
-                <li>修复验证码记录提示错误</li>
-                <li>修复request.js缺少Message引用</li>
-                <li>修复表格时间为空出现的异常</li>
-                <li>添加Jackson日期反序列化时区配置</li>
-                <li>调整根据用户权限加载菜单数据树形结构</li>
-                <li>调整成功登陆不恢复按钮,防止多次点击</li>
-                <li>修改用户个人资料同步缓存信息</li>
-                <li>修复页面同时出现el-upload和Editor不显示处理</li>
-                <li>修复在角色管理页修改菜单权限偶尔未选中问题</li>
-                <li>配置文件新增redis密码属性</li>
-                <li>设置mybatis全局的配置文件</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-
-            <el-collapse-item title="v2.0.0 - 2019-12-02">
-              <ol>
-                <li>新增代码生成</li>
-                <li>新增@RepeatSubmit注解,防止重复提交</li>
-                <li>新增菜单主目录添加/删除操作</li>
-                <li>日志记录过滤特殊对象,防止转换异常</li>
-                <li>修改代码生成路由脚本错误</li>
-                <li>用户上传头像实时同步缓存,无需重新登录</li>
-                <li>调整切换页签后不重新加载数据</li>
-                <li>添加jsencrypt实现参数的前端加密</li>
-                <li>系统退出删除用户缓存记录</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v1.1.0 - 2019-11-11">
-              <ol>
-                <li>新增在线用户管理</li>
-                <li>新增按钮组功能实现(批量删除、导出、清空)</li>
-                <li>新增查询条件重置按钮</li>
-                <li>新增Swagger全局Token配置</li>
-                <li>新增后端参数校验</li>
-                <li>修复字典管理页面的日期查询异常</li>
-                <li>修改时间函数命名防止冲突</li>
-                <li>去除菜单上级校验,默认为顶级</li>
-                <li>修复用户密码无法修改问题</li>
-                <li>修复菜单类型为按钮时不显示权限标识</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v1.0.0 - 2019-10-08">
-              <ol>
-                <li>若依前后端分离系统正式发布</li>
-              </ol>
-            </el-collapse-item>
-          </el-collapse>
-        </el-card>
-      </el-col>
-      <el-col :xs="24" :sm="24" :md="12" :lg="8">
-        <el-card class="update-log">
-          <div slot="header" class="clearfix">
-            <span>捐赠支持</span>
-          </div>
-          <div class="body">
-            <img
-              src="https://oscimg.oschina.net/oscnet/up-d6695f82666e5018f715c41cb7ee60d3b73.png"
-              alt="donate"
-              width="100%"
-            />
-            <span style="display: inline-block; height: 30px; line-height: 30px"
-              >你可以请作者喝杯咖啡表示鼓励</span
-            >
-          </div>
-        </el-card>
-      </el-col>
-    </el-row>
-    <div id="box" style="width:100%;height:300px"></div>
+    <div style="width: 100%;margin-bottom: 50px">
+      <el-table :data="tableData" style="width: 50%;float: left">
+        <el-table-column prop="name" label="待办列表" width="250"></el-table-column>
+        <el-table-column prop="date" label="时间" width="250"></el-table-column>
+        <el-table-column prop="address" label="操作"></el-table-column>
+      </el-table>
+      <el-table :data="tableData" style="width: 25%;float: left;margin-left: 20px;margin-right: 20px">
+        <el-table-column prop="name" label="提醒列表" width="220" />
+        <el-table-column prop="address" label="操作" />
+      </el-table>
+      <el-table :data="tableData" style="width: 15%;">
+        <el-table-column prop="name" label="新闻公告" />
+      </el-table>
+    </div>
+    <div style="display: flex;margin-top: 100px">
+      <div id="box" style="width:30%;height:350px;"></div>
+      <div id="bug" style="width:35%;height:350px;"></div>
+      <div id="temp" style="width:30%;height:350px;"></div>
+    </div>
   </div>
 </template>
 
 <script>
-export default {
-  name: "index",
-  data() {
-    return {
-      // 版本号
-      version: "3.2.1",
-    };
-  },
-  mounted() {
-     this.drawLine();
-  },
-  methods: {
-    goTarget(href) {
-      window.open(href, "_blank");
+  export default {
+    name: "index",
+    data() {
+      return {
+        // 版本号
+        version: "3.2.1",
+        tableData: [{
+          date: '2020-11-20 12:00',
+          name: '某客户出库单审核',
+          address: '查看详情'
+        }, {
+          date: '2020-11-20 12:00',
+          name: '某客户账单审核',
+          address: '查看详情'
+        }, {
+          date: '2020-11-20 12:00',
+          name: '仓储费审核结算审核',
+          address: '查看详情'
+        }, {
+          date: '2020-11-20 12:00',
+          name: '某客户出库单审核',
+          address: '查看详情'
+        }, {
+          date: '2020-11-20 12:00',
+          name: '仓储费审核结算审核',
+          address: '查看详情'
+        }, {
+          date: '2020-11-20 12:00',
+          name: '仓储费审核结算审核',
+          address: '查看详情'
+        }, {
+          date: '2020-11-20 12:00',
+          name: '某客户账单审核',
+          address: '查看详情'
+        }, {
+          date: '2020-11-20 12:00',
+          name: '某客户账单审核',
+          address: '查看详情'
+        }, {
+          date: '2020-11-20 12:00',
+          name: '某客户账单审核',
+          address: '查看详情'
+        }]
+      };
+    },
+    mounted() {
+      this.drawLine();
+      this.bug_ss();
+      this.temp();
     },
-      drawLine(){
+    methods: {
+      goTarget(href) {
+        window.open(href, "_blank");
+      },
+      drawLine() {
         // 基于准备好的dom,初始化echarts实例,所以只能在mounted中调用
         let myChart = this.$echarts.init(document.getElementById('box'))
         // 绘制图表
         myChart.setOption({
-            title: { text: '在Vue中使用echarts' },
-            tooltip: {},
-            xAxis: {  // x坐标
-                data: ["衬衫","羊毛衫","雪纺衫","裤子","高跟鞋","袜子"]
+          tooltip: {
+            trigger: 'axis',
+            axisPointer: { // 坐标轴指示器,坐标轴触发有效
+              type: 'shadow' // 默认为直线,可选为:'line' | 'shadow'
+            }
+          },
+          radar: {
+            float:'left',
+            radius: '66%',
+            center: ['50%', '42%'],
+            splitNumber: 8,
+            splitArea: {
+              areaStyle: {
+                color: 'rgba(127,95,132,.3)',
+                opacity: 1,
+                shadowBlur: 45,
+                shadowColor: 'rgba(0,0,0,.5)',
+                shadowOffsetX: 0,
+                shadowOffsetY: 15
+              }
             },
-            yAxis: {},  // y坐标
-            series: [{
-                name: '销量',
-                type: 'bar',  // 表格类型
-                data: [5, 20, 36, 10, 10, 20]
-            }]
+            indicator: [
+              { name: '对比', max: 10000 },
+              { name: '对比', max: 20000 },
+              { name: '对比', max: 20000 },
+              { name: '对比', max: 20000 },
+              { name: '对比', max: 20000 },
+              { name: '对比', max: 20000 }
+            ]
+          },
+          legend: {
+            left: 'center',
+            bottom: '10',
+            data: ['某商品1', '某商品2', '某商品3']
+          },
+          series: [{
+            type: 'radar',
+            symbolSize: 0,
+            areaStyle: {
+              normal: {
+                shadowBlur: 13,
+                shadowColor: 'rgba(0,0,0,.2)',
+                shadowOffsetX: 0,
+                shadowOffsetY: 10,
+                opacity: 1
+              }
+            },
+            data: [
+              {
+                value: [5000, 7000, 12000, 11000, 15000, 14000],
+                name: '某商品1'
+              },
+              {
+                value: [4000, 9000, 15000, 15000, 13000, 11000],
+                name: '某商品2'
+              },
+              {
+                value: [5500, 11000, 12000, 15000, 12000, 12000],
+                name: '某商品3'
+              }
+            ]
+          }]
         });
-    }
-  },
-};
+      },
+      bug_ss() {
+        // 基于准备好的dom,初始化echarts实例,所以只能在mounted中调用
+        let myChart_s = this.$echarts.init(document.getElementById('bug'));
+
+        // 指定图表的配置项和数据
+        myChart_s.setOption({
+          tooltip: {
+            trigger: 'item',
+            formatter: '{a} <br/>{b} : {c} ({d}%)'
+          },
+          legend: {
+            left: 'center',
+            bottom: '10',
+            data: ['库存1', '库存2', '库存3', '库存4', '库存5']
+          },
+          series: [
+            {
+              name: 'WEEKLY WRITE ARTICLES',
+              type: 'pie',
+              roseType: 'radius',
+              radius: [15, 95],
+              center: ['50%', '38%'],
+              data: [
+                { value: 320, name: '库存1' },
+                { value: 240, name: '库存2' },
+                { value: 149, name: '库存3' },
+                { value: 100, name: '库存4' },
+                { value: 59, name: '库存5' }
+              ],
+              animationEasing: 'cubicInOut',
+              animationDuration: 2600
+            }
+          ]
+        })
+      },
+      temp() {
+        // 基于准备好的dom,初始化echarts实例,所以只能在mounted中调用
+        let myChart_s = this.$echarts.init(document.getElementById('temp'));
+
+        // 指定图表的配置项和数据
+        myChart_s.setOption({
+          xAxis: {
+            type: 'category',
+            data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']
+          },
+          yAxis: {
+            type: 'value'
+          },
+          series: [{
+            data: [120, 200, 150, 80, 70, 110, 130],
+            type: 'bar',
+            showBackground: true,
+            backgroundStyle: {
+              color: 'rgba(220, 220, 220, 0.8)'
+            }
+          }]
+        })
+      }
+    },
+  };
 </script>
 
 <style scoped lang="scss">
-.home {
-  blockquote {
-    padding: 10px 20px;
-    margin: 0 0 20px;
-    font-size: 17.5px;
-    border-left: 5px solid #eee;
-  }
-  hr {
-    margin-top: 20px;
-    margin-bottom: 20px;
-    border: 0;
-    border-top: 1px solid #eee;
-  }
-  .col-item {
-    margin-bottom: 20px;
-  }
+  .home {
+    blockquote {
+      padding: 10px 20px;
+      margin: 0 0 20px;
+      font-size: 17.5px;
+      border-left: 5px solid #eee;
+    }
 
-  ul {
-    padding: 0;
-    margin: 0;
-  }
+    hr {
+      margin-top: 20px;
+      margin-bottom: 20px;
+      border: 0;
+      border-top: 1px solid #eee;
+    }
 
-  font-family: "open sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
-  font-size: 13px;
-  color: #676a6c;
-  overflow-x: hidden;
+    .col-item {
+      margin-bottom: 20px;
+    }
 
-  ul {
-    list-style-type: none;
-  }
+    ul {
+      padding: 0;
+      margin: 0;
+    }
 
-  h4 {
-    margin-top: 0px;
-  }
+    font-family: "open sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
+    font-size: 13px;
+    color: #676a6c;
+    overflow-x: hidden;
 
-  h2 {
-    margin-top: 10px;
-    font-size: 26px;
-    font-weight: 100;
-  }
+    ul {
+      list-style-type: none;
+    }
+
+    h4 {
+      margin-top: 0px;
+    }
+
+    h2 {
+      margin-top: 10px;
+      font-size: 26px;
+      font-weight: 100;
+    }
 
-  p {
-    margin-top: 10px;
+    p {
+      margin-top: 10px;
 
-    b {
-      font-weight: 700;
+      b {
+        font-weight: 700;
+      }
     }
-  }
 
-  .update-log {
-    ol {
-      display: block;
-      list-style-type: decimal;
-      margin-block-start: 1em;
-      margin-block-end: 1em;
-      margin-inline-start: 0;
-      margin-inline-end: 0;
-      padding-inline-start: 40px;
+    .update-log {
+      ol {
+        display: block;
+        list-style-type: decimal;
+        margin-block-start: 1em;
+        margin-block-end: 1em;
+        margin-inline-start: 0;
+        margin-inline-end: 0;
+        padding-inline-start: 40px;
+      }
     }
   }
-}
 </style>
 

+ 16 - 16
src/views/login.vue

@@ -18,20 +18,20 @@
           <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
         </el-input>
       </el-form-item>
-      <el-form-item prop="code">
-        <el-input
-          v-model="loginForm.code"
-          auto-complete="off"
-          placeholder="验证码"
-          style="width: 63%"
-          @keyup.enter.native="handleLogin"
-        >
-          <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />
-        </el-input>
-        <div class="login-code">
-          <img :src="codeUrl" @click="getCode" class="login-code-img"/>
-        </div>
-      </el-form-item>
+<!--      <el-form-item prop="code">-->
+<!--        <el-input-->
+<!--          v-model="loginForm.code"-->
+<!--          auto-complete="off"-->
+<!--          placeholder="验证码"-->
+<!--          style="width: 63%"-->
+<!--          @keyup.enter.native="handleLogin"-->
+<!--        >-->
+<!--          <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />-->
+<!--        </el-input>-->
+<!--        <div class="login-code">-->
+<!--          <img :src="codeUrl" @click="getCode" class="login-code-img"/>-->
+<!--        </div>-->
+<!--      </el-form-item>-->
       <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox>
       <el-form-item style="width:100%;">
         <el-button
@@ -48,7 +48,7 @@
     </el-form>
     <!--  底部  -->
     <div class="el-login-footer">
-      <span>Copyright © 2018-2020 ruoyi.vip All Rights Reserved.</span>
+      <span>Copyright © 2020-2020 大木仓储管理系统</span>
     </div>
   </div>
 </template>
@@ -68,7 +68,7 @@ export default {
         username: "admin",
         password: "admin123",
         rememberMe: false,
-        code: "",
+        code: "111111111",
         uuid: ""
       },
       loginRules: {

+ 2 - 2
vue.config.js

@@ -34,8 +34,8 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://192.168.137.68:9010`,
-        // target: `http://engineering.echepei.com:9010/`,
+        // target: `http://192.168.137.68:9010`,
+        target: `http://engineering.echepei.com:9010/`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''