20240924

src/api/fanucGroup/currency.js

@@ -30,7 +30,7 @@ export const updateExchangeCurrency= data => createAPI(`/currency/exchange/amend
 export const deleteExchangeCurrency= data => createAPI(`/currency/exchange/delete`,'post',data)
 
 
-
+export const queryUserSite = (data) => createAPI('/site/list','post',data)
 
 
 

src/views/modules/fanuc/currency.vue

@@ -1,54 +1,44 @@
 <template>
   <div class="mod-config">
-
-    <!--    &lt;!&ndash; 收藏 &ndash;&gt;-->
-    <!--    <div>-->
-    <!--      <span @click="favoriteFunction()">-->
-    <!--        <icon-svg :name="favorite?'xiangqufill':'xiangqu'" class="sl-svg"></icon-svg>-->
-    <!--      </span>-->
-    <!--    </div>-->
-
-    <!-- 条件查询 -->
-    <el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList()">
-      <el-form-item :label="'工厂编号'">
-        <el-input v-model="searchData.site" clearable style="width: 120px"></el-input>
-      </el-form-item>
-
-      <el-form-item :label="'货币'">
-        <el-input v-model="searchData.currency" clearable style="width: 120px"></el-input>
-      </el-form-item>
-      <el-form-item :label="'货币描述'">
-        <el-input v-model="searchData.currencyDesc" clearable style="width: 120px"></el-input>
-      </el-form-item>
-      <el-form-item label="状态">
-        <el-select v-model="searchData.active" placeholder="请选择">
-          <el-option label="全部" value=" "></el-option>
-          <el-option label="启用" value="Y"></el-option>
-          <el-option label="禁用" value="N"></el-option>
-        </el-select>
-      </el-form-item>
-
-      <el-form-item :label="' '">
-        <el-button v-if="!authSearch" type="primary" @click="getDataList()">查询</el-button>
-        <el-button v-if="!authSave" type="primary" @click="addModal()">新增</el-button>
-        <!--        <download-excel-->
-        <!--          :fields="fields()"-->
-        <!--          :data="exportData"-->
-        <!--          type="xls"-->
-        <!--          :name="exportName"-->
-        <!--          :header="exportHeader"-->
-        <!--          :footer="exportFooter"-->
-        <!--          :fetch="createExportData"-->
-        <!--          :before-generate="startDownload"-->
-        <!--          :before-finish="finishDownload"-->
-        <!--          worksheet="导出信息"-->
-        <!--          class="el-button el-button&#45;&#45;primary el-button&#45;&#45;medium">-->
-        <!--          {{ "导出" }}-->
-        <!--        </download-excel>-->
-      </el-form-item>
-
-
-    </el-form>
+    <div style="width: 1000px">
+      <el-form label-position="top" :model="searchData" @keyup.enter.native="getDataList()">
+        <el-row :gutter="10">
+          <el-col :span="4">
+            <el-form-item label="工厂编号">
+              <el-select v-model="searchData.site" style="width: 100%">
+                <el-option label="全部" value=" "></el-option>
+                <el-option :label="site.sitename" :value="site.siteid" v-for="(site) in siteList" :key="site.siteid"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="货币">
+              <el-input v-model="searchData.currency" clearable ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <el-form-item label="货币描述">
+              <el-input v-model="searchData.currencyDesc" clearable ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="3">
+            <el-form-item label="状态">
+              <el-select v-model="searchData.active" style="width: 100%" placeholder="请选择">
+                <el-option label="全部" value=" "></el-option>
+                <el-option label="启用" value="Y"></el-option>
+                <el-option label="禁用" value="N"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="3">
+            <el-form-item label=" ">
+              <el-button v-if="!authSearch" type="primary" @click="getDataList()">查询</el-button>
+              <el-button v-if="!authSave" type="primary" @click="addModal()">新增</el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
 
 
     <!-- 展示列表 -->
@@ -57,6 +47,7 @@
       :data="dataList"
       @row-click="changeData"
       border
+      :row-style="rowStyle"
       style="width: 100%;">
       <el-table-column
         v-for="(item,index) in columnList" :key="index"
@@ -66,12 +57,16 @@
         :show-overflow-tooltip="item.showOverflowTooltip"
         :align="item.align"
         :fixed="item.fixed==''?false:item.fixed"
-        :width="item.columnWidth"
+        :min-width="item.columnWidth"
         :label="item.columnLabel">
         <template slot-scope="scope">
-          <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
-          <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
-                                             style="width: 100px; height: 80px"/></span>
+          <template v-if="item.columnProp==='active'">
+            <span > {{ scope.row[item.columnProp] === 'Y'? '启用' : '停用' }}</span>
+          </template>
+          <template v-else>
+            <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
+            <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
+          </template>
         </template>
       </el-table-column>
       <el-table-column
@@ -103,15 +98,14 @@
           <el-row style="display: flex">
             <el-card style="width: 50%">
             <el-col >
-              <el-col>
-                <span>参考货币</span>
-              </el-col>
+              <div>参考货币</div>
               <el-button v-if="!authSave" type="primary" @click="addModal1()">新增</el-button>
               <el-table
                 :data="dataList1"
                 @row-click="changeData2"
                 :height="height"
                 border
+                :row-style="rowStyle2"
                 style="width: 100%; ">
                 <el-table-column
                   v-for="(item,index) in columnList1" :key="index"
@@ -136,7 +130,7 @@
                   width="160"
                   label="操作">
                   <template slot-scope="scope">
-                    <a type="text" size="small" @click="updateModal1(scope.row)">修改</a>
+<!--                    <a type="text" size="small" @click="updateModal1(scope.row)">修改</a>-->
                     <a type="text" size="small" @click="deleteModal1(scope.row)">删除</a>
                   </template>
                 </el-table-column>
@@ -178,7 +172,7 @@
                   width="160"
                   label="操作">
                   <template slot-scope="scope">
-                    <a type="text" size="small" @click="updateModal2(scope.row)">修改</a>
+<!--                    <a type="text" size="small" @click="updateModal2(scope.row)">修改</a>-->
                     <a type="text" size="small" @click="deleteModal2(scope.row)">删除</a>
                   </template>
                 </el-table-column>
@@ -186,94 +180,111 @@
             </el-col>
             </el-card>
           </el-row>
-
-
       </el-tab-pane>
     </el-tabs>
 
 
 <!--    货币新增修改-->
-    <el-dialog title="货币" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="500px">
-      <el-form :inline="true" label-position="top" :model="modalData" :rules="rules"
-               style="margin-left: 7px;margin-top: -5px;">
-
-        <el-form-item label="工厂编码:" prop="site" :rules="rules.site">
-          <el-input v-model="modalData.site" style="width: 221px" :disabled="!isNew"></el-input>
-        </el-form-item>
-
-        <el-form-item label="货币:" prop="currency" :rules="rules.currency">
-          <el-input v-model="modalData.currency" :disabled="modalDisableFlag" style="width: 221px"></el-input>
-        </el-form-item>
-
-        <el-form-item label="货币描述:" @change="" prop="currencyDesc">
-          <el-input v-model="modalData.currencyDesc" style="width: 221px"></el-input>
-        </el-form-item>
-
-        <el-form-item label="状态:" prop="active">
-          <el-select v-model="modalData.active"  placeholder="请选择" style="width: 221px">
-            <el-option label="启用" value="Y"></el-option>
-            <el-option label="禁用" value="N"></el-option>
-          </el-select>
-        </el-form-item>
-
-        <el-form-item label="本位币:" prop="baseCurrencyFlag">
-          <el-checkbox v-model="modalData.baseCurrencyFlag" style="width: 221px"></el-checkbox>
-        </el-form-item>
+    <el-dialog title="货币" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="450px">
+      <el-form label-position="top" :model="modalData" :rules="rules" >
+        <el-row :gutter="10">
+          <el-col :span="10">
+            <el-form-item label="工厂编码" prop="site">
+              <el-select v-model="modalData.site" :disabled="modalDisableFlag" style="width: 100%">
+                <el-option :label="site.sitename" :value="site.siteid" v-for="(site) in siteList" :key="site.siteid"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="10">
+          <el-col :span="10">
+            <el-form-item label="货币:" prop="currency">
+              <el-input v-model="modalData.currency" :disabled="modalDisableFlag" ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="14">
+            <el-form-item label="货币描述" prop="currencyDesc">
+              <el-input v-model="modalData.currencyDesc" ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="10">
+            <el-form-item label="状态" prop="active">
+              <el-select v-model="modalData.active" style="width: 100%"  placeholder="请选择">
+                <el-option label="启用" value="Y"></el-option>
+                <el-option label="停用" value="N"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label=" ">
+              <el-checkbox v-model="modalData.baseCurrencyFlag" false-label="N" true-label="Y">本位币</el-checkbox>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
-      <el-footer style="height:40px;margin-top: 20px;text-align:center">
+      <el-footer style="height:30px;line-height:30px;text-align:center">
         <el-button type="primary" @click="saveData()">保存</el-button>
         <el-button type="primary" @click="modalFlag = false">关闭</el-button>
       </el-footer>
-
     </el-dialog>
 
 
     <!-- 货币参考新增和修改  -->
     <el-dialog title="货币参考" :close-on-click-modal="false" v-drag :visible.sync="modalFlag1" width="500px">
-      <el-form :inline="true" label-position="top" :model="modalData1" :rules="rules"
-               style="margin-left: 7px;margin-top: -5px;">
-
-        <el-form-item label="工厂编码:" prop="site" :rules="rules.site">
-          <el-input v-model="modalData1.site" style="width: 221px" :disabled="!isNew"></el-input>
-        </el-form-item>
-
-        <el-form-item label="货币:" prop="currency">
-          <el-input  v-model="modalData1.currency" style="width: 221px"></el-input>
-        </el-form-item>
-
-        <el-form-item label="货币描述:" prop="currencyDesc" >
-          <el-input  v-model="modalData1.currencyDesc"  style="width: 221px"></el-input>
-        </el-form-item>
-
-
-        <el-form-item :label="'最近汇率日期：'" >
-          <el-date-picker
-            style="width: 221px"
-            v-model="modalData1.createDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择日期">
-          </el-date-picker>
-        </el-form-item>
+      <el-form label-position="top" :model="modalData1" :rules="rules" >
+        <el-row :gutter="10">
+          <el-col :span="10">
+            <el-form-item label="工厂编码" prop="site">
+              <el-select v-model="modalData1.site" disabled style="width: 100%">
+                <el-option :label="site.sitename" :value="site.siteid" v-for="(site) in siteList" :key="site.siteid"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="10">
+          <el-col :span="10">
+            <el-form-item label="参考货币" prop="currency">
+              <template slot="label">
+                <a @click="handleClickCurrency">参考货币</a>
+              </template>
+              <el-input v-model="modalData1.currency" @blur="handleBlurCurrency"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="14">
+            <el-form-item label="参考货币描述" prop="currencyDesc">
+              <el-input v-model="modalData1.currencyDesc" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="10">
+            <el-form-item label="最近汇率日期" >
+              <el-date-picker
+                style="width: 100%"
+                v-model="modalData1.createDate"
+                type="date"
+                disabled
+                value-format="yyyy-MM-dd"
+                placeholder="选择日期">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
-      <el-footer style="height:40px;margin-top: 20px;text-align:center">
+      <el-footer style="height:30px;line-height:30px;text-align:center">
         <el-button type="primary" @click="saveData1()">保存</el-button>
         <el-button type="primary" @click="modalFlag1 = false">关闭</el-button>
       </el-footer>
     </el-dialog>
 
     <!-- 货币汇率新增和修改  -->
-    <el-dialog title="货币汇率" :close-on-click-modal="false" v-drag :visible.sync="modalFlag2" width="300px">
-      <el-form :inline="true" label-position="top" :model="modalData2" :rules="rules"
-               style="margin-left: 7px;margin-top: -5px;">
-
-        <el-form-item label="汇率:" prop="exchangeRate"  >
-          <el-input class="inlineNumber numInput" v-model="modalData2.exchangeRate" style="width: 200px" ></el-input>
+    <el-dialog title="货币汇率" top="20vh" :close-on-click-modal="false" v-drag :visible.sync="modalFlag2" width="200px">
+      <el-form label-position="top" :model="modalData2" :rules="rules">
+        <el-form-item label="汇率:" prop="exchangeRate">
+          <el-input-number v-model="modalData2.exchangeRate" style="width: 100%;" :controls="false" :step="0" :precision="4"></el-input-number>
         </el-form-item>
 
-        <el-form-item :label="'启用日期：'" >
+        <el-form-item label="启用日期" >
           <el-date-picker
-            style="width: 200px"
+            style="width: 100%"
             v-model="modalData2.activationDate"
             type="date"
             value-format="yyyy-MM-dd"
@@ -282,13 +293,63 @@
         </el-form-item>
 
       </el-form>
-      <el-footer style="height:40px;margin-top: 20px;text-align:center">
+      <el-footer style="height:30px;line-height:30px;text-align:center">
         <el-button type="primary" @click="saveData2()">保存</el-button>
         <el-button type="primary" @click="modalFlag2 = false">关闭</el-button>
       </el-footer>
     </el-dialog>
 
-
+    <el-dialog title="货币信息" top="18vh" :close-on-click-modal="false" v-drag :visible.sync="currencyVisible" width="500px">
+      <el-form label-position="top" :model="currency">
+        <el-row :gutter="10">
+          <el-col :span="6">
+            <el-form-item label="货币" >
+              <el-input v-model="currency.currency"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="货币描述" >
+              <el-input v-model="currency.currencyDesc"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label=" " >
+              <el-button type="primary" @click="queryCurrency">查询</el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-table
+        :data="currencyList"
+        :height="300"
+        @row-dblclick="handleDblclick"
+        border>
+        <el-table-column
+          prop="currency"
+          label="货币"
+          min-width="100">
+        </el-table-column>
+        <el-table-column
+          prop="currencyDesc"
+          label="货币描述"
+          min-width="160">
+        </el-table-column>
+        <el-table-column
+          prop="active"
+          label="状态"
+          min-width="80">
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page="no"
+        :page-sizes="[20, 50, 100, 200, 500]"
+        :page-size="size"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper">
+      </el-pagination>
+    </el-dialog>
   </div>
 </template>
 
@@ -312,6 +373,8 @@ import {
   updateExchangeCurrency,//修改
   deleteExchangeCurrency,//删除
 
+  queryUserSite
+
 } from '@/api/fanucGroup/currency.js'
 
 export default {
@@ -639,7 +702,7 @@ export default {
           serialNumber: '501004TableActivationDate',
           tableId: '501004Table',
           tableName: '启用日期',
-          columnWidth: 110,
+          columnWidth: 140,
           columnProp: 'activationDate',
           headerAlign: 'center',
           align: 'left',
@@ -687,42 +750,6 @@ export default {
           status: true,
           fixed: '',
         },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 501004,
-          serialNumber: '501004TableUpdateDate',
-          tableId: '501004Table',
-          tableName: '更改时间',
-          columnWidth: 110,
-          columnProp: 'updateDate',
-          headerAlign: 'center',
-          align: 'center',
-          columnLabel: '更改时间',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 501004,
-          serialNumber: '501004TableUpdateBy',
-          tableId: '501004Table',
-          tableName: '更改人',
-          columnWidth: 110,
-          columnProp: 'updateBy',
-          headerAlign: 'center',
-          align: 'center',
-          columnLabel: '更改人',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-        },
       ],
       rules: {
         currency: [
@@ -754,6 +781,18 @@ export default {
       authUpdate: false,
       authDelete: false,
       menuId: this.$route.meta.menuId,
+
+      siteList:[],
+      currencyVisible:false,
+      currency:{
+        site: '',
+        currency: '',
+        currencyDesc: '',
+      },
+      currencyList:[],
+      no: 1,
+      size: 20,
+      total: 0,
     }
   },
 
@@ -776,14 +815,18 @@ export default {
         });
 
       }
+    },
+    'modalData1.currency'(newVal,oldVal){
+      this.modalData1.currency = newVal.toUpperCase();
     }
   },
 
   created () {
+    this.handleQuerySite()
     //页面在加载的时候就调用查询方法
     this.getDataList()
     // 获取用户的 site 和 bu
-    this.getSiteAndBuByUserName()
+    // this.getSiteAndBuByUserName()
   },
 
   methods: {
@@ -834,7 +877,7 @@ export default {
     refreshCurrentTabTable () {
       findRefCurrency(this.currentRow).then(({data}) => {
         //区分请求成功和失败的状况
-        if (data && data.code == 0) {
+        if (data && data.code === 0) {
           this.dataList1 = data.rows
         } else {
           this.dataList1 = []
@@ -860,6 +903,7 @@ export default {
     //货币
     // 新增按钮
     addModal () {
+      this.handleQuerySite();
       this.modalData = {
         flag: '1',
         site: this.$store.state.user.site,
@@ -968,6 +1012,10 @@ export default {
     //货币参考
     // 新增按钮
     addModal1 () {
+      if (!this.currentRow){
+        this.$message.warning('请选择货币记录！')
+        return
+      }
       this.modalData1 = {
         flag1: '1',
         id: '',
@@ -1004,9 +1052,7 @@ export default {
       }).then(() => {
         deleteRefCurrency(row).then(({data}) => {
           if (data && data.code === 0) {
-            this.changeData()
             this.refreshCurrentTabTable ()
-            this.changeData (row)
             this.$message({
               message: '操作成功',
               type: 'success',
@@ -1073,6 +1119,10 @@ export default {
     //货币汇率
     // 新增按钮
     addModal2 () {
+      if (!this.currentRow2){
+        this.$message.warning('请选择参考货币记录！')
+        return
+      }
       this.modalData2 = {
         flag: '1',
         id: '',
@@ -1156,7 +1206,6 @@ export default {
       }).then(() => {
         deleteExchangeCurrency(row).then(({data}) => {
           if (data && data.code === 0) {
-            this.changeData2()
             this.refreshCurrentTabTable2()
             this.$message({
               message: '操作成功',
@@ -1325,7 +1374,88 @@ export default {
       this.authUpdate = !updateFlag
       this.authDelete = !deleteFlag
     },
-
+    handleQuerySite(){
+      let params = {
+        username: this.$store.state.user.name,
+      }
+      queryUserSite(params).then(({data})=>{
+        if (data && data.code === 0){
+          this.siteList = data.row2
+        }else {
+          this.$message.warning(data.msg)
+        }
+      }).catch((error)=>{
+        this.$message.error(error)
+      })
+    },
+    rowStyle({row}){
+      if (this.currentRow.site === row.site && this.currentRow.currency === row.currency) {
+        return { 'background-color': '#E8F7F6', cursor: 'pointer' };
+      }
+    },
+    rowStyle2({row}){
+      if (this.currentRow2.id === row.id) {
+        return { 'background-color': '#E8F7F6', cursor: 'pointer' };
+      }
+    },
+    handleBlurCurrency(){
+      let params = {
+        site: this.modalData1.site,
+        currency: this.modalData1.currency,
+        page: 1,
+        limit: this.searchData.limit,
+      }
+      findCurrency(params).then(({data}) => {
+        if ( data && data.code === 0) {
+          if (data.page.list.length === 1){
+            this.modalData1.currency = this.dataList[0].currency
+            this.modalData1.currencyDesc = this.dataList[0].currencyDesc
+          }else {
+            this.modalData1.currencyDesc = ''
+          }
+        }else {
+          this.$message.warning(data.msg)
+        }
+      }).catch((error)=>{
+        this.$message.error(error)
+      })
+    },
+    handleClickCurrency(){
+      this.currency.site = this.modalData1.site
+      this.currency.currency = this.modalData1.currency
+      this.queryCurrency();
+      this.currencyVisible = true
+    },
+    queryCurrency(){
+      let params = {
+        ...this.currency,
+        page: this.no,
+        limit: this.size,
+      }
+      findCurrency(params).then(({data}) => {
+        if ( data && data.code === 0) {
+          this.currencyList = data.page.list
+          this.total = data.page.totalCount
+        }else {
+          this.$message.warning(data.msg)
+        }
+      }).catch((error)=>{
+        this.$message.error(error)
+      })
+    },
+    handleSizeChange(val){
+      this.size = val
+      this.queryCurrency()
+    },
+    handleCurrentChange(val){
+      this.no = val
+      this.queryCurrency()
+    },
+    handleDblclick(row){
+      this.modalData1.currency = row.currency
+      this.modalData1.currencyDesc = row.currencyDesc
+      this.currencyVisible = false
+    }
   }
 }
 </script>

src/views/modules/fanuc/fanuc.vue

@@ -58,8 +58,13 @@
         :min-width="item.columnWidth"
         :label="item.columnLabel">
         <template slot-scope="scope">
-          <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
-          <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
+          <template v-if="item.columnProp==='active'">
+            <span > {{ scope.row[item.columnProp] === 'Y'? '启用' : '停用' }}</span>
+          </template>
+          <template v-else>
+            <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
+            <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
+          </template>
         </template>
       </el-table-column>
     </el-table>

src/views/modules/fanuc/fanucGroup.vue

@@ -114,7 +114,7 @@
             <el-form-item label="状态">
               <el-select v-model="modalData.status" placeholder="请选择" style="width: 100%">
                 <el-option label="启用" value="Y"></el-option>
-                <el-option label="禁用" value="N"></el-option>
+                <el-option label="停用" value="N"></el-option>
               </el-select>
             </el-form-item>
           </el-col>