Finish Hotfix-52

src/views/basic_data/dealer/dealer_list.vue

@@ -30,7 +30,7 @@
       <div class="mymain-container">
         <div class="table">
           <el-table v-loading="listLoading" :data="dataList" element-loading-text="Loading" border fit highlight-current-row stripe>
-            <el-table-column align="left" label="客户编码" prop="number" min-width="100">
+            <el-table-column align="left" label="客户编码" prop="number" min-width="110">
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.number" />
                 <span>{{scope.row.number}}</span>

src/views/basic_data/dealer/dealer_stock.vue

@@ -40,7 +40,7 @@
       <div class="table">
         <el-table v-loading="listLoading" :data="dataList" @select="hanleSelect" @select-all="hanleSelect" element-loading-text="Loading" border fit highlight-current-row stripe>
           <el-table-column type="selection" align="center" min-width="51"></el-table-column>
-          <el-table-column align="left" label="经销商编码" prop="customerNumber" min-width="100" show-overflow-tooltip>
+          <el-table-column align="left" label="经销商编码" prop="customerNumber" min-width="110" show-overflow-tooltip>
             <template slot-scope="scope">
               <CopyButton :copyText="scope.row.customerNumber" />
               <span>{{scope.row.customerNumber}}</span>

src/views/engin_deposit/components/refund_list-detail.vue

@@ -24,7 +24,7 @@
           <div class="value">{{ detailList.refEnginRecordNo }}</div>
         </el-col> -->
         <el-col :xs="12" :sm="24" :lg="8" class="item">
-          <div class="label">项目名称</div>
+          <div class="label">项目类别</div>
           <div class="value">{{ detailList.refProjectName }}</div>
         </el-col>
         <el-col :xs="12" :sm="24" :lg="8" class="item">
@@ -186,7 +186,7 @@
     <div class="mymain-container">
       <div class="table">
         <el-table v-loading="listLoading" :data="detailList.items" element-loading-text="Loading" border fit highlight-current-row stripe show-summary :summary-method="$getSummaries">
-          <el-table-column align="left" label="厂编号" prop="factoryNo" min-width="160" show-overflow-tooltip>\
+          <el-table-column align="left" label="跨区厂编号" prop="factoryNo" min-width="160" show-overflow-tooltip>\
             <template slot-scope="scope">
               <CopyButton :copyText="scope.row.factoryNo" />
               <span>{{scope.row.factoryNo}}</span>
@@ -222,7 +222,7 @@
             </template>
           </el-table-column>
           <el-table-column align="right" label="数量" prop="qty" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="right" label="金额" prop="totalAmount" min-width="160" show-overflow-tooltip>
+          <!-- <el-table-column align="right" label="金额" prop="totalAmount" min-width="160" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ scope.row.totalAmount | numToFixed }}
             </template>
@@ -244,7 +244,7 @@
             <template slot-scope="scope">
               <el-input v-model="scope.row.diffAmount"></el-input>
             </template>
-          </el-table-column>
+          </el-table-column> -->
         </el-table>
       </div>
     </div>

src/views/engin_deposit/refund_list.vue

@@ -14,7 +14,7 @@
         <el-form ref="searchForm" :model="searchForm" label-width="160px" size="mini" label-position="left">
           <el-row :gutter="20">
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="工程登录(信息)编号" prop="refEnginRecordNo">
+              <el-form-item label="工程登录编号" prop="refEnginRecordNo">
                 <el-input v-model="searchForm.refEnginRecordNo" placeholder="请输入"></el-input>
               </el-form-item>
             </el-col>
@@ -104,18 +104,32 @@
             >
             <el-table-column type="selection" align="center" width="55">
             </el-table-column>
-            <el-table-column align="left" label="工程登录编码" prop="refEnginRecordNo" min-width="160" show-overflow-tooltip>
+            <el-table-column align="left" label="状态" prop="" min-width="160" show-overflow-tooltip>
+              <template v-slot="{ row }">
+                <el-tag size="mini" v-show="row.examineStatus == 'SAVE'">保存</el-tag>
+                <el-tag size="mini" v-show="row.examineStatus == 'WAIT'" type="warning">待审核</el-tag>
+                <el-tag size="mini" v-show="row.examineStatus == 'OK'" type="success">通过</el-tag>
+                <el-tag size="mini" v-show="row.examineStatus == 'FAIL'" type="danger">不通过</el-tag>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="工程登录编号" prop="refEnginRecordNo" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.refEnginRecordNo" />
                 <span>{{scope.row.refEnginRecordNo}}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="工程名称" prop="refProjectName" min-width="160" show-overflow-tooltip>
+            <el-table-column align="left" label="项目类别" prop="refProjectName" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.refProjectName" />
                 <span>{{scope.row.refProjectName}}</span>
               </template>
             </el-table-column>
+            <el-table-column align="left" label="机型" prop="specification" min-width="160" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copyText="scope.row.specification" />
+                <span>{{scope.row.a}}</span>
+              </template>
+            </el-table-column>
             <el-table-column align="left" label="经销商编码" prop="customerNumber" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.customerNumber" />
@@ -128,14 +142,36 @@
                 <span>{{scope.row.customerName}}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="状态" prop="" min-width="160" show-overflow-tooltip>
-              <template v-slot="{ row }">
-                <el-tag v-show="row.examineStatus == 'SAVE'">保存</el-tag>
-                <el-tag v-show="row.examineStatus == 'WAIT'" type="warning">待审核</el-tag>
-                <el-tag v-show="row.examineStatus == 'OK'" type="success">通过</el-tag>
-                <el-tag v-show="row.examineStatus == 'FAIL'" type="danger">不通过</el-tag>
+            <el-table-column align="left" label="跨区厂编号" prop="refFactoryNo" min-width="260" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copyText="scope.row.refFactoryNo" />
+                <span>{{scope.row.refFactoryNo}}</span>
+              </template>
+            </el-table-column>
+            <!-- <el-table-column align="left" label="产品编码" prop="customerName" min-width="260" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copyText="scope.row.customerName" />
+                <span>{{scope.row.customerName}}</span>
               </template>
             </el-table-column>
+            <el-table-column align="left" label="物料编码" prop="customerName" min-width="260" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copyText="scope.row.customerName" />
+                <span>{{scope.row.customerName}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="产品名称" prop="customerName" min-width="260" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copyText="scope.row.customerName" />
+                <span>{{scope.row.customerName}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="规格型号" prop="customerName" min-width="260" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copyText="scope.row.customerName" />
+                <span>{{scope.row.customerName}}</span>
+              </template>
+            </el-table-column> -->
             <el-table-column align="right" label="押金金额" prop="depositAmount" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.depositAmount | numToFixed }}

src/views/finance/finance_sum.vue

@@ -1,13 +1,13 @@
 <template>
   <div class="app-container">
-    <!-- 筛选条件
+    <!-- 筛选条件 -->
     <div>
       <el-form ref="searchForm" :model="searchForm" label-width="100px" size="mini" label-position="left">
         <el-row :gutter="20">
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="选择品类" prop="mainId">
-              <el-select v-model="searchForm.mainId" class="selectStyle" placeholder="请选择" filterable>
-                <el-option v-for="v in categoryList" :key="v.productCategoryNumber" :label="v.productCategoryName" :value="v.productCategoryNumber">
+            <el-form-item label="区域" prop="websitId">
+              <el-select v-model="searchForm.websitId" class="selectStyle" placeholder="请选择" filterable>
+                <el-option v-for="(v, i) in areaList" :key="i" :label="v.name" :value="v.adminWebsitId">
                 </el-option>
               </el-select>
             </el-form-item>
@@ -21,7 +21,7 @@
           </el-col>
         </el-row>
       </el-form>
-    </div> -->
+    </div>
     <!-- 列表 -->
     <div class="mymain-container">
       <div class="table">
@@ -66,6 +66,7 @@ import {
   getFinanceTotal,
   getProductCategoryList,
 } from "@/api/finance/finance_sum";
+import { getAdminWebsitByparent } from "@/api/finance/blance_sum";
 export default {
   data() {
     return {
@@ -73,25 +74,33 @@ export default {
       // pageSize: 10, // 每页数量
       // listTotal: 0, // 列表总数
       dataList: [], // 列表数据
+      areaList: [],
       searchForm: {
-        mainId: "",
+        // mainId: "",
+        websitId: "",
       }, //搜索表单
       listLoading: false, // 列表加载loading
       categoryList: [], //品类数据
     };
   },
   created() {
-    this.getCategoryList();
+    // this.getCategoryList();
+    this.getAreaList();
     this.getDataList();
   },
   methods: {
+    //获取区域数据
+    async getAreaList() {
+      let res = await getAdminWebsitByparent({ parentId: 1 });
+      this.areaList = res.data;
+    },
     //清空
     async clearFn() {
       await this.$refs.searchForm.resetFields();
     },
     //搜索
     searchFn() {
-      this.getDataList({ mainId: this.searchForm.mainId });
+      this.getDataList({ websitId: this.searchForm.websitId });
     },
     //获取品类数据
     async getCategoryList() {

src/views/finance/receipt_list.vue

@@ -7,7 +7,13 @@
           <el-row :gutter="20">
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="单据类型" prop="billType">
-                <el-input v-model="searchForm.billType" placeholder="请输入"></el-input>
+                <!-- <el-input v-model="searchForm.billType" placeholder="请输入"></el-input> -->
+                <el-select v-model="searchForm.billType" class="selectStyle" placeholder="请选择" filterable>
+                  <el-option label="收款单" value="1"> </el-option>
+                  <el-option label="付款单" value="3"> </el-option>
+                  <el-option label="退款单" value="2"> </el-option>
+
+                </el-select>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
@@ -110,7 +116,7 @@
             </el-table-column>
             <el-table-column align="right" label="表头·实收金额" prop="amount" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
-                {{ scope.row.billType == 3? -scope.row.amount:scope.row.amount | numToFixed }}
+                {{ (scope.row.billType == 3 || scope.row.billType == 2)? -scope.row.amount:scope.row.amount | numToFixed }}
               </template>
             </el-table-column>
             <el-table-column align="right" label="收款金额" prop="" min-width="160" show-overflow-tooltip></el-table-column>

src/views/finance/receivable_list.vue

@@ -18,6 +18,7 @@
                   <el-option value="工程押金"> </el-option>
                   <el-option value="保证金"> </el-option>
                   <el-option value="工程价差"> </el-option>
+                  <el-option value="仓储费"> </el-option>
                 </el-select>
               </el-form-item>
             </el-col>

src/views/setting/account.vue

@@ -25,7 +25,7 @@
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="账号名称" prop="name">
+              <el-form-item label="角色" prop="name">
                 <el-select class="selectStyle" v-model="screenForm.roleId" placeholder="请选择" filterable>
                   <el-option v-for="(v, i) in roleList" :key="i" :label="v.name" :value="v.adminRoleId">
                   </el-option>

src/views/setting/other.vue

@@ -6,6 +6,9 @@
       <el-radio-button label="third">自动预留单生成</el-radio-button>
       <el-radio-button label="fourth">库存显示规则设置</el-radio-button>
       <el-radio-button label="fifth">二次打印密码设置</el-radio-button>
+      <el-radio-button label="sixth">机型类别</el-radio-button>
+      <el-radio-button label="seventh">登录类型</el-radio-button>
+      <el-radio-button label="eigth">权限分类</el-radio-button>
     </el-radio-group>
 
     <div v-show="formType === 'first'">
@@ -20,7 +23,9 @@
     <div v-show="formType === 'second'">
       <div style="margin: 40px 0 30px;">
         <div>工程登录二次引用密码设置</div>
-        <div><el-input v-model="secondForm.input1.dictValue" placeholder="请输入密码" size="small" style="width: 150px; margin-top: 20px;"></el-input></div>
+        <div>
+          <el-input v-model="secondForm.input1.dictValue" placeholder="请输入密码" size="small" style="width: 150px; margin-top: 20px;"></el-input>
+        </div>
       </div>
       <el-button type="primary" size="small" @click="submitForm('second')">确 定</el-button>
     </div>
@@ -71,20 +76,49 @@
     <div v-show="formType === 'fifth'">
       <div style="margin: 40px 0 30px;">
         <div>二次打印密码设置</div>
-        <div><el-input v-model="fifthForm.input1.dictValue" placeholder="请输入密码" size="small" style="width: 150px; margin-top: 20px;"></el-input></div>
+        <div>
+          <el-input v-model="fifthForm.input1.dictValue" placeholder="请输入密码" size="small" style="width: 150px; margin-top: 20px;"></el-input>
+        </div>
       </div>
       <el-button type="primary" size="small" @click="submitForm('fifth')">确 定</el-button>
     </div>
+
+    <div v-show="formType === 'sixth'">
+      <div style="margin: 40px 0 30px;">
+        <!-- 列表 -->
+        <div class="mymain-container">
+          <div class="table">
+            <el-table v-loading="listLoading" :data="dataList" element-loading-text="Loading" border fit highlight-current-row stripe>
+
+              <el-table-column align="left" label="名称" prop="takerName" min-width="160" show-overflow-tooltip></el-table-column>
+              <el-table-column align="left" label="备注" prop="identity" min-width="170" show-overflow-tooltip></el-table-column>
+
+              <el-table-column align="center" label="操作" prop="caozuo" min-width="160" show-overflow-tooltip fixed="right">
+                <!-- <template slot-scope="scope">
+                  <el-button type="text" class="textColor">编辑</el-button>
+                </template> -->
+              </el-table-column>
+            </el-table>
+          </div>
+          <!-- 分页 -->
+          <div class="fr">
+            <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage" :page-sizes="[10, 20, 30, 50]" :page-size="10" layout="total, sizes, prev, pager, next, jumper" :total="listTotal">
+            </el-pagination>
+          </div>
+        </div>
+      </div>
+      <el-button type="primary" size="small">确 定</el-button>
+    </div>
   </div>
 </template>
 
 <script>
-import { getDictList, editDictList } from '@/api/common'
+import { getDictList, editDictList } from "@/api/common";
 
 export default {
   data() {
     return {
-      formType: 'first',
+      formType: "first",
       firstForm: {
         input1: {},
       },
@@ -104,11 +138,11 @@ export default {
       },
       fifthForm: {
         input1: {},
-      }
-    }
+      },
+    };
   },
   created() {
-    this.getDetail('first');
+    this.getDetail("first");
   },
   methods: {
     // 查询按钮权限
@@ -126,68 +160,70 @@ export default {
 
     getDetail(type) {
       const MAP = {
-        first: 'ORDER_TIME_LIMIT',
-        second: 'ENGIN_TWO_PWD',
-        third: 'RESERVED_DAY',
-        fourth: 'STOCK_ORDER',
-        fifth: 'PRINT_PASSWORD',
+        first: "ORDER_TIME_LIMIT",
+        second: "ENGIN_TWO_PWD",
+        third: "RESERVED_DAY",
+        fourth: "STOCK_ORDER",
+        fifth: "PRINT_PASSWORD",
+        sixth: "MACHINE_TYPE",
+        seventh: "POWER_CATEGORY",
+        eigth: "SIGN_TYPE",
       };
-      getDictList({sysDictEnum: MAP[type]}).then(res => {
-        let data = res.data.map(item => {
+      getDictList({ sysDictEnum: MAP[type] }).then((res) => {
+        let data = res.data.map((item) => {
           return {
             sysDictId: item.sysDictId,
             dictValue: item.dictValue,
-          }
-        })
-        if(type != 'fourth') {
-          this[type+'Form'].input1 = data[0];
-        }else {
-          this[type+'Form'].input1 = data[0];
-          this[type+'Form'].input2 = data[1];
-          this[type+'Form'].input3 = data[2];
-          this[type+'Form'].input4 = data[3];
-          this[type+'Form'].input5 = data[4];
-          this[type+'Form'].input6 = data[5];
+          };
+        });
+        if (type != "fourth") {
+          this[type + "Form"].input1 = data[0];
+        } else {
+          this[type + "Form"].input1 = data[0];
+          this[type + "Form"].input2 = data[1];
+          this[type + "Form"].input3 = data[2];
+          this[type + "Form"].input4 = data[3];
+          this[type + "Form"].input5 = data[4];
+          this[type + "Form"].input6 = data[5];
         }
-      })
+      });
     },
 
     submitForm(type) {
       let list = [];
-      for(var key in this[type+'Form']) {
-        console.log(this[type+'Form'], this[type+'Form'][key].dictValue);
-        if(!this[type+'Form'][key].dictValue) {
-          return this.$errorMsg('请完善信息');
+      for (var key in this[type + "Form"]) {
+        console.log(this[type + "Form"], this[type + "Form"][key].dictValue);
+        if (!this[type + "Form"][key].dictValue) {
+          return this.$errorMsg("请完善信息");
         }
-        list.push(this[type+'Form'][key]);
+        list.push(this[type + "Form"][key]);
       }
-      editDictList(list).then(res => {
-        this.$successMsg('保存成功');
+      editDictList(list).then((res) => {
+        this.$successMsg("保存成功");
         this.getDetail(type);
-      })
-    }
-
-  }
-}
+      });
+    },
+  },
+};
 </script>
 
 <style scoped lang="scss">
-  .app-container {
-    color: #333333;
-    font-size: 14px;
-  }
+.app-container {
+  color: #333333;
+  font-size: 14px;
+}
 </style>
 <style>
-  .demo-table-expand {
-    font-size: 0;
-  }
-  .demo-table-expand label {
-    width: 80px;
-    color: #99a9bf;
-  }
-  .demo-table-expand .el-form-item {
-    margin-right: 0;
-    margin-bottom: 0;
-    width: 100%;
-  }
+.demo-table-expand {
+  font-size: 0;
+}
+.demo-table-expand label {
+  width: 80px;
+  color: #99a9bf;
+}
+.demo-table-expand .el-form-item {
+  margin-right: 0;
+  margin-bottom: 0;
+  width: 100%;
+}
 </style>