修改问题

src/lang/en/langModule/InventoryManagement.js

@@ -13,7 +13,7 @@ export default{
    chzl:"Loss Weight（kg）",
    qm:'End of Period',
    qmkc:"End of Period Inventory（kg）",
-   qmje:"End of Period Amount（yuan)",
+   qmje:"End of Period Amount（$)",
    ylfx:"Feed Analysis",
    tjlx:"Type of Statistics",
    wc:"Error",

src/lang/en/langModule/formulationEvaluation.js

@@ -12,7 +12,7 @@ export default{
    cdb:"Crude Protein(g)",
    pfl:"Formula Quantity",
    l:"Phosphorus(g)",
-   cnjndm:"Milk Net Energy(MCal/DM)",
+   cnjndm:"Milk production net energy(MCal/DM)",
    zf:"Fat(%DM)",
    df:'Starch(%DM)',
    dnf:"NDF(%DM)",
@@ -87,7 +87,9 @@ fou:"No",
 tHeader:['Formula Name', 'Formula Code', 'Livestock Category', 'Formula Type', 'Source', 'Remarks', 'Is Enabled', 'Feed Group', 'Feed Name', 'Weight (kg)', 'Mixing Delay (min)', 'Is the Ratio of Cattle Heads Locked', 'Order'],
 tHeader1:[
   'Formula Name', 'Livestock Category', 'Formula Type', 'Remarks', 'Feed Group', 'Feed Name', 'Weight (kg)', 'Mixing Delay (min)', 'Is the Ratio of Cattle Heads Locked', 'Error Message'
-]
+  ],
+
+   cdb1:"Crude Protein(%DM)"
 
 
 

src/lang/en/langModule/message.js

@@ -65,7 +65,7 @@ msg62: "Pens Details:",
 msg63: "Formula Details",
 msg64: "Weight (KG)",
 msg65: "(3.5) Feed Conversion Efficiency (kg/DM)",
-msg66: "Daily Milk Cost per Kilogram (Yuan)",
+msg66: "Daily Milk Cost per Kilogram ($)",
 //
 msg67: "Please select the formula to be issued",
 msg68: "The formula is not enabled and cannot be issued",
@@ -258,7 +258,7 @@ msg238: "Please select TMR equipment information",
 
 //
 msg239: "Equipment type/equipment number/equipment name/data collection card number cannot be empty",
-mag240: "Equipment number/equipment name/data collection card number cannot be empty" ,
+msg240: "Equipment number/equipment name/data collection card number cannot be empty" ,
 msg241: "Equipment name/data collection card number cannot be empty",
 msg242: "Equipment number cannot be empty",
 msg243: "Equipment number cannot contain special characters",

src/lang/zn/langModule/formulationEvaluation.js

@@ -7,7 +7,7 @@ export default{
   csl:"采食量",
   cnjn:"产奶净能(MJ)",
 
-   
+
    nnnldw:"奶牛能量单位(NND)",
    cdb:"粗蛋白(g)",
    pfl:"配方量",
@@ -25,7 +25,7 @@ export default{
    nnxq:"奶牛需要",
    gwz:"干物质(kg)",
    slzhl:"(4.0)饲料转化效率(kg/DM)",
-   
+
    rlcb:"日粮成本(元)",
    gwzcb:"干物质成本(元/公斤)",
    rgjncb:"日公斤奶成本(元)",
@@ -87,7 +87,10 @@ fou:"否",
 tHeader:['配方名称', '配方编码', '牲畜类别', '配方类型', '来源', '备注', '是否启用', '饲料组', '饲料名称', '重量（kg）', '搅拌延时（min）', '是否锁定牛头数比例', '顺序'],
 tHeader1:[
   '配方名称', '牲畜类别', '配方类型', '备注', '饲料组', '饲料名称', '重量（kg）', '搅拌延时（min）', '是否锁定牛头数比例', '错误信息'
-]
+  ],
+
+  cdb1:"粗蛋白(%DM)"
+
 
 
 
@@ -111,7 +114,6 @@ tHeader1:[
 
 
 
-   
 
 
 
@@ -127,4 +129,4 @@ tHeader1:[
 
 
 
-}
+}

src/lang/zn/langModule/message.js

@@ -261,8 +261,6 @@ msg235:'跳转重量域请输入0-40之间整数',
 msg236:'TMR设备编号不可输入特殊字符',
 msg237:'TMR设备名称不能为空',
 msg238:'请选择TMR设备信息',
-
-//
 msg239:'设备类型/设备编号/设备名称/数据采集卡编号不能为空',
 msg240:'设备编号/设备名称/数据采集卡编号不能为空',
 msg241:'设备名称/数据采集卡编号不能为空',

src/views/basicData/forkliftManagement/index.vue

@@ -1,17 +1,57 @@
 <template>
   <div class="app-container">
     <div class="search">
-      <el-input v-model="table.getdataListParm.parammaps.Code" :placeholder="$t('driver.sbcode')" style="width: 180px;" class="filter-item" clearable />
-      <el-input v-model="table.getdataListParm.parammaps.name" :placeholder="$t('driver.sbname')" style="width: 180px;" class="filter-item" clearable />
-      <el-select v-model="table.getdataListParm.parammaps.enable" filterable :placeholder="$t('formulationEvaluation.sfqy')" class="filter-item" style="width: 120px;" clearable>
-        <el-option v-for="item in enableList" :key="item.id" :label="item.name" :value="item.id" />
+      <el-input
+        v-model="table.getdataListParm.parammaps.Code"
+        :placeholder="$t('driver.sbcode')"
+        style="width: 180px"
+        class="filter-item"
+        clearable
+      />
+      <el-input
+        v-model="table.getdataListParm.parammaps.name"
+        :placeholder="$t('driver.sbname')"
+        style="width: 180px"
+        class="filter-item"
+        clearable
+      />
+      <el-select
+        v-model="table.getdataListParm.parammaps.enable"
+        filterable
+        :placeholder="$t('formulationEvaluation.sfqy')"
+        class="filter-item"
+        style="width: 120px"
+        clearable
+      >
+        <el-option
+          v-for="item in enableList"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        />
       </el-select>
-      <el-button class="successBorder" @click="form_search">{{$t('common.query')}}</el-button>
-      <el-button class="successBorder" @click="handleRefresh">{{$t('common.reset')}}</el-button>
+      <el-button class="successBorder" @click="form_search">{{
+        $t('common.query')
+      }}</el-button>
+      <el-button class="successBorder" @click="handleRefresh">{{
+        $t('common.reset')
+      }}</el-button>
     </div>
     <div class="operation">
-      <el-button v-if="isRoleEdit" class="success" icon="el-icon-plus" @click="handleCreate">{{$t('formulationEvaluation.add')}}</el-button>
-      <el-button v-if="isRoleEdit" class="danger" icon="el-icon-delete" @click="form_delete">{{$t('formulationEvaluation.del')}}</el-button>
+      <el-button
+        v-if="isRoleEdit"
+        class="success"
+        icon="el-icon-plus"
+        @click="handleCreate"
+        >{{ $t('formulationEvaluation.add') }}</el-button
+      >
+      <el-button
+        v-if="isRoleEdit"
+        class="danger"
+        icon="el-icon-delete"
+        @click="form_delete"
+        >{{ $t('formulationEvaluation.del') }}</el-button
+      >
     </div>
     <div class="table">
       <el-form ref="form" :rules="table.rules" :model="table">
@@ -23,83 +63,208 @@
           border
           fit
           highlight-current-row
-          style="width: 100%;"
+          style="width: 100%"
           :row-style="rowStyle"
           :cell-style="cellStyle"
           class="elTable table-fixed"
           @selection-change="handleSelectionChange"
         >
           <el-table-column type="selection" align="center" width="50" />
-          <el-table-column :label="$t('formulationEvaluation.xh')" align="center" type="index" width="50px">
+          <el-table-column
+            :label="$t('formulationEvaluation.xh')"
+            align="center"
+            type="index"
+            width="50px"
+          >
             <template slot-scope="scope">
-              <span v-if="table.pageNum">{{ scope.$index + (table.pageNum-1) * table.pageSize + 1 }}</span>
+              <span v-if="table.pageNum">{{
+                scope.$index + (table.pageNum - 1) * table.pageSize + 1
+              }}</span>
               <span v-else>1</span>
             </template>
           </el-table-column>
-          <el-table-column :label="$t('driver.sbtype')" min-width="110px" align="center">
+          <el-table-column
+            :label="$t('driver.sbtype')"
+            min-width="110px"
+            align="center"
+          >
             <template slot-scope="scope">
               <span v-if="scope.row.NoEdit">{{ scope.row.tclassname }}</span>
-              <el-select v-if="scope.row.Edit" v-model="scope.row.tclassid" @change="changeTclass">
-                <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.label" :value="item.id" />
+              <el-select
+                v-if="scope.row.Edit"
+                v-model="scope.row.tclassid"
+                @change="changeTclass"
+              >
+                <el-option
+                  v-for="item in equipmentTypeList"
+                  :key="item.id"
+                  :label="item.label"
+                  :value="item.id"
+                />
               </el-select>
             </template>
           </el-table-column>
-          <el-table-column :label="$t('driver.sbcode')" min-width="110px" align="center">
+          <el-table-column
+            :label="$t('driver.sbcode')"
+            min-width="110px"
+            align="center"
+          >
             <template slot-scope="scope">
               <span v-if="scope.row.NoEdit">{{ scope.row.Code }}</span>
-              <el-input v-if="scope.row.Edit" v-model="scope.row.Code"
-:placeholder="$t('supplier.zf1')" type="textarea" :autosize="{ minRows: 1.3, maxRows: 4}" maxlength="32" style="width:80%;padding:10px 0;" />
+              <el-input
+                v-if="scope.row.Edit"
+                v-model="scope.row.Code"
+                :placeholder="$t('supplier.zf1')"
+                type="textarea"
+                :autosize="{ minRows: 1.3, maxRows: 4 }"
+                maxlength="32"
+                style="width: 80%; padding: 10px 0"
+              />
             </template>
           </el-table-column>
-          <el-table-column :label="$t('driver.sbname')" min-width="110px" align="center">
+          <el-table-column
+            :label="$t('driver.sbname')"
+            min-width="110px"
+            align="center"
+          >
             <template slot-scope="scope">
               <span v-if="scope.row.NoEdit">{{ scope.row.name }}</span>
-              <el-input v-if="scope.row.Edit" v-model="scope.row.name" type="textarea" :autosize="{ minRows: 1.3, maxRows: 4}" style="width:80%;padding:10px 0;" maxlength="32" />
+              <el-input
+                v-if="scope.row.Edit"
+                v-model="scope.row.name"
+                type="textarea"
+                :autosize="{ minRows: 1.3, maxRows: 4 }"
+                style="width: 80%; padding: 10px 0"
+                maxlength="32"
+              />
             </template>
           </el-table-column>
-          <el-table-column :label="$t('driver.sjcjkbh')" min-width="110px" align="center">
+          <el-table-column
+            :label="$t('driver.sjcjkbh')"
+            min-width="110px"
+            align="center"
+          >
             <template slot-scope="scope">
               <span v-if="scope.row.NoEdit">{{ scope.row.infoCode }}</span>
-              <el-input v-if="scope.row.Edit" v-model="scope.row.infoCode" type="number" step="0.01" style="width:80%;padding:10px 0;" />
+              <el-input
+                v-if="scope.row.Edit"
+                v-model="scope.row.infoCode"
+                type="number"
+                step="0.01"
+                style="width: 80%; padding: 10px 0"
+              />
             </template>
           </el-table-column>
-          <el-table-column :label="$t('formulationEvaluation.remark')" min-width="110px" align="center">
+          <el-table-column
+            :label="$t('formulationEvaluation.remark')"
+            min-width="110px"
+            align="center"
+          >
             <template slot-scope="scope">
               <span v-if="scope.row.NoEdit">{{ scope.row.remark }}</span>
-              <el-input v-if="scope.row.Edit" v-model="scope.row.remark" type="textarea" :autosize="{ minRows: 1.3, maxRows: 4}" style="width:95%;padding:10px 0;" />
+              <el-input
+                v-if="scope.row.Edit"
+                v-model="scope.row.remark"
+                type="textarea"
+                :autosize="{ minRows: 1.3, maxRows: 4 }"
+                style="width: 95%; padding: 10px 0"
+              />
             </template>
           </el-table-column>
-          <el-table-column :label="$t('formulationEvaluation.sfqy')" min-width="110px" align="center">
+          <el-table-column
+            :label="$t('formulationEvaluation.sfqy')"
+            min-width="110px"
+            align="center"
+          >
             <template slot-scope="scope">
-              <el-switch v-model="scope.row.enable" :disabled="scope.row.NoEdit==true" active-color="#13ce66" inactive-color="#ff4949" :active-value="1" :inactive-value="0" @change="handleEnableChange(scope.$index, scope.row)" />
+              <el-switch
+                v-model="scope.row.enable"
+                :disabled="scope.row.NoEdit == true"
+                active-color="#13ce66"
+                inactive-color="#ff4949"
+                :active-value="1"
+                :inactive-value="0"
+                @change="handleEnableChange(scope.$index, scope.row)"
+              />
             </template>
           </el-table-column>
-          <el-table-column  :label="$t('errorAnalysis.cz')" align="center" width="80" class-name="small-padding fixed-width" fixed="right">
-            <template slot-scope="{row}">
+          <el-table-column
+            :label="$t('errorAnalysis.cz')"
+            align="center"
+            width="80"
+            class-name="small-padding fixed-width"
+            fixed="right"
+          >
+            <template slot-scope="{ row }">
               <!-- 新增 -->
-              <el-button v-if="row.isCreate" :disabled="isokDisable" icon="el-icon-folder-checked" class="miniSuccess" @click="createData(row)" />
+              <el-button
+                v-if="row.isCreate"
+                :disabled="isokDisable"
+                icon="el-icon-folder-checked"
+                class="miniSuccess"
+                @click="createData(row)"
+              />
               <span v-if="row.isCreate" class="centerSpan">|</span>
-              <el-button v-if="row.isCreate" class="minCancel" icon="el-icon-close" @click="createCancel(row)" />
+              <el-button
+                v-if="row.isCreate"
+                class="minCancel"
+                icon="el-icon-close"
+                @click="createCancel(row)"
+              />
               <!-- 编辑 -->
-              <el-button v-if="row.isUpdate && isRoleEdit" class="miniSuccess" icon="el-icon-edit-outline" @click="handleUpdate(row)" />
-              <span v-if="row.isUpdate && isRoleEdit" class="centerSpan">|</span>
-              <el-button v-if="row.isUpdate && isRoleEdit" class="miniDanger" icon="el-icon-delete" @click="handleRowDelete(row)" />
+              <el-button
+                v-if="row.isUpdate && isRoleEdit"
+                class="miniSuccess"
+                icon="el-icon-edit-outline"
+                @click="handleUpdate(row)"
+              />
+              <span v-if="row.isUpdate && isRoleEdit" class="centerSpan"
+                >|</span
+              >
+              <el-button
+                v-if="row.isUpdate && isRoleEdit"
+                class="miniDanger"
+                icon="el-icon-delete"
+                @click="handleRowDelete(row)"
+              />
               <!-- 编辑保存 -->
-              <el-button v-if="row.isUpdateSave" :disabled="isokDisable" icon="el-icon-folder-checked" class="miniSuccess" @click="updateData(row)" />
+              <el-button
+                v-if="row.isUpdateSave"
+                :disabled="isokDisable"
+                icon="el-icon-folder-checked"
+                class="miniSuccess"
+                @click="updateData(row)"
+              />
               <span v-if="row.isUpdateSave" class="centerSpan">|</span>
-              <el-button v-if="row.isUpdateSave" class="minCancel" icon="el-icon-close" @click="updateCancel(row)" />
+              <el-button
+                v-if="row.isUpdateSave"
+                class="minCancel"
+                icon="el-icon-close"
+                @click="updateCancel(row)"
+              />
             </template>
           </el-table-column>
         </el-table>
       </el-form>
-      <pagination v-show="table.total>=0" :total="table.total" :page.sync="table.getdataListParm.offset" :limit.sync="table.getdataListParm.pagecount" @pagination="getList" />
+      <pagination
+        v-show="table.total >= 0"
+        :total="table.total"
+        :page.sync="table.getdataListParm.offset"
+        :limit.sync="table.getdataListParm.pagecount"
+        @pagination="getList"
+      />
     </div>
   </div>
-
 </template>
 
 <script>
-import { GetDataByName, PostDataByName, failproccess, ExecDataByConfig, checkButtons } from '@/api/common'
+import {
+  GetDataByName,
+  PostDataByName,
+  failproccess,
+  ExecDataByConfig,
+  checkButtons
+} from '@/api/common'
 import Cookies from 'js-cookie'
 import Pagination from '@/components/Pagination'
 import { MessageBox } from 'element-ui'
@@ -123,7 +288,12 @@ export default {
       },
       table: {
         rules: {
-          name: { type: 'string', required: true, message:  this.$t('message.msg159'), trigger: 'change' }
+          name: {
+            type: 'string',
+            required: true,
+            message: this.$t('message.msg159'),
+            trigger: 'change'
+          }
         },
         getdataListParm: {
           name: 'getTmrEquipment',
@@ -149,7 +319,6 @@ export default {
       selectList: [],
       rowStyle: { maxHeight: 30 + 'px', height: 30 + 'px' },
       cellStyle: { padding: 0 + 'px' }
-
     }
   },
 
@@ -161,19 +330,22 @@ export default {
 
   methods: {
     getDownList() {
-      GetDataByName(this.getdownListParm).then(response => {
+      GetDataByName(this.getdownListParm).then((response) => {
         this.equipmentTypeList = response.data.list
       })
     },
     getButtons() {
       const Edit = 'ForkliftManagement'
-      const isRoleEdit = checkButtons(JSON.parse(sessionStorage.getItem('buttons')), Edit)
+      const isRoleEdit = checkButtons(
+        JSON.parse(sessionStorage.getItem('buttons')),
+        Edit
+      )
       this.isRoleEdit = isRoleEdit
     },
     getList() {
       this.table.listLoading = true
-      GetDataByName(this.table.getdataListParm).then(response => {
-        if (response.data  && response.data.list ) {
+      GetDataByName(this.table.getdataListParm).then((response) => {
+        if (response.data && response.data.list) {
           for (let i = 0; i < response.data.list.length; i++) {
             this.$set(response.data.list[i], 'Edit', false) // 编辑
             this.$set(response.data.list[i], 'NoEdit', true) // 不可编辑/输入
@@ -197,7 +369,9 @@ export default {
       console.log('点击了是否启用')
     },
     changeTclass(item) {
-      this.table.temp.tclassname = this.equipmentTypeList.find(obj => obj.id == item).name
+      this.table.temp.tclassname = this.equipmentTypeList.find(
+        (obj) => obj.id == item
+      ).name
       console.log(this.table.temp)
     },
     form_search() {
@@ -220,11 +394,26 @@ export default {
       // 新增操true,编辑false，编辑保存false
       for (let i = 0; i < this.table.list.length; i++) {
         if (this.table.list[i].Edit == true) {
-          this.$message({ type: 'error', message: this.$t('driver.messageNote'), duration: 2000 })
+          this.$message({
+            type: 'error',
+            message: this.$t('driver.messageNote'),
+            duration: 2000
+          })
           return false
         }
       }
-      this.table.list.unshift({ 'myId': (new Date()).valueOf(), 'Edit': true, 'NoEdit': false, 'isCreate': true, 'isUpdate': false, 'isUpdateSave': false, 'enable': 1, 'Code': '', 'name': '', 'infoCode': '' })
+      this.table.list.unshift({
+        myId: new Date().valueOf(),
+        Edit: true,
+        NoEdit: false,
+        isCreate: true,
+        isUpdate: false,
+        isUpdateSave: false,
+        enable: 1,
+        Code: '',
+        name: '',
+        infoCode: ''
+      })
     },
     createData(row) {
       console.log('点击了新增保存')
@@ -235,42 +424,93 @@ export default {
       this.table.temp.enable = row.enable
       this.table.temp.remark = row.remark
       this.table.temp.tclassid = row.tclassid
-      if (this.table.temp.tclassid == '' && this.table.temp.Code == '' && this.table.temp.name == '' && this.table.temp.infoCode == '') {
-        this.$message({ type: 'error', message: this.$t('message.msg239'), duration: 2000 })
+      if (
+        this.table.temp.tclassid == '' &&
+        this.table.temp.Code == '' &&
+        this.table.temp.name == '' &&
+        this.table.temp.infoCode == ''
+      ) {
+        this.$message({
+          type: 'error',
+          message: this.$t('message.msg239'),
+          duration: 2000
+        })
         return false
-      } else if (this.table.temp.Code == '' && this.table.temp.name == '' && this.table.temp.infoCode == '') {
-        this.$message({ type: 'error', message: this.$t('message.msg240'), duration: 2000 })
+      } else if (
+        this.table.temp.Code == '' &&
+        this.table.temp.name == '' &&
+        this.table.temp.infoCode == ''
+      ) {
+        this.$message({
+          type: 'error',
+          message: this.$t('message.msg240'),
+          duration: 2000
+        })
         return false
       } else if (this.table.temp.name == '' && this.table.temp.infoCode == '') {
-        this.$message({ type: 'error', message: this.$t('message.msg241'), duration: 2000 })
+        this.$message({
+          type: 'error',
+          message: this.$t('message.msg241'),
+          duration: 2000
+        })
         return false
       } else if (this.table.temp.tclassid == '') {
-        this.$message({ type: 'error', message: this.$t('message.msg231'), duration: 2000 })
+        this.$message({
+          type: 'error',
+          message: this.$t('message.msg231'),
+          duration: 2000
+        })
         return false
       } else if (this.table.temp.name == '') {
-        this.$message({ type: 'error', message: this.$t('message.msg229'), duration: 2000 })
+        this.$message({
+          type: 'error',
+          message: this.$t('message.msg229'),
+          duration: 2000
+        })
         return false
       } else if (this.table.temp.Code == '') {
-        this.$message({ type: 'error', message: this.$t('message.msg242'), duration: 2000 })
+        this.$message({
+          type: 'error',
+          message: this.$t('message.msg242'),
+          duration: 2000
+        })
         return false
       } else if (this.table.temp.infoCode == '') {
-        this.$message({ type: 'error', message: this.$t('message.msg230'), duration: 2000 })
+        this.$message({
+          type: 'error',
+          message: this.$t('message.msg230'),
+          duration: 2000
+        })
         return false
       }
       const infoCode = /^([0-9]|(1[0-5]))$/
       if (!infoCode.test(parseInt(this.table.temp.infoCode))) {
-        this.$message({ type: 'error', message: this.$t('message.msg233'), duration: 2000 })
+        this.$message({
+          type: 'error',
+          message: this.$t('message.msg233'),
+          duration: 2000
+        })
         return false
       }
 
-      const pattern = new RegExp("[`~!@#$^&*()=|{}':;',\\[\\].<>/?~！@#￥……&*（）——|{}【】‘；：”“'。，、？]")
+      const pattern = new RegExp(
+        "[`~!@#$^&*()=|{}':;',\\[\\].<>/?~！@#￥……&*（）——|{}【】‘；：”“'。，、？]"
+      )
       console.log(this.table.temp.Code)
       if (pattern.test(this.table.temp.Code)) {
-        this.$message({ type: 'error', message: this.$t('message.msg243'), duration: 2000 })
+        this.$message({
+          type: 'error',
+          message: this.$t('message.msg243'),
+          duration: 2000
+        })
         return false
       }
       if (pattern.test(this.table.temp.name)) {
-        this.$message({ type: 'error', message: this.$t('message.msg243'), duration: 2000 })
+        this.$message({
+          type: 'error',
+          message: this.$t('message.msg243'),
+          duration: 2000
+        })
         return false
       }
       this.isokDisable = true
@@ -279,23 +519,41 @@ export default {
       }, 1000)
       this.requestParam.name = 'insertTmrEquipment'
       this.requestParam.parammaps = this.table.temp
-      PostDataByName(this.requestParam).then(response => {
+      PostDataByName(this.requestParam).then((response) => {
         console.log('新增保存发送参数', this.requestParam)
         if (response.msg !== 'fail') {
-          this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
+          this.$notify({
+            title: this.$t('common.succes'),
+            message: this.$t('driver.saveSuccess'),
+            type: 'success',
+            duration: 2000
+          })
           this.getList()
         } else {
           const isRepeat = new RegExp('Duplicate entry :code')
           const isRepeat2 = new RegExp('Duplicate entry :infocode')
           if (isRepeat.test(response.data)) {
-            this.$notify({ type: 'error', message: this.$t('message.msg244'), duration: 2000 })
+            this.$notify({
+              type: 'error',
+              message: this.$t('message.msg244'),
+              duration: 2000
+            })
             return false
           }
           if (isRepeat2.test(response.data)) {
-            this.$notify({ type: 'error', message: this.$t('message.msg245'), duration: 2000 })
+            this.$notify({
+              type: 'error',
+              message: this.$t('message.msg245'),
+              duration: 2000
+            })
             return false
           }
-          this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
+          this.$notify({
+            title: this.$t('driver.saveFail'),
+            message: response.data,
+            type: 'warning',
+            duration: 2000
+          })
         }
       })
     },
@@ -314,7 +572,11 @@ export default {
     handleUpdate(row) {
       for (let i = 0; i < this.table.list.length; i++) {
         if (this.table.list[i].Edit == true) {
-          this.$message({ type: 'error', message: this.$t('driver.messageNote'), duration: 2000 })
+          this.$message({
+            type: 'error',
+            message: this.$t('driver.messageNote'),
+            duration: 2000
+          })
           return false
         }
       }
@@ -337,42 +599,93 @@ export default {
       this.table.temp.tclassid = row.tclassid
       this.table.temp.tclassname = row.tclassname
       this.table.temp.id = row.id
-      if (this.table.temp.tclassid == '' && this.table.temp.Code == '' && this.table.temp.name == '' && this.table.temp.infoCode == '') {
-        this.$message({ type: 'error', message: this.$t('message.msg239'), duration: 2000 })
+      if (
+        this.table.temp.tclassid == '' &&
+        this.table.temp.Code == '' &&
+        this.table.temp.name == '' &&
+        this.table.temp.infoCode == ''
+      ) {
+        this.$message({
+          type: 'error',
+          message: this.$t('message.msg239'),
+          duration: 2000
+        })
         return false
-      } else if (this.table.temp.Code == '' && this.table.temp.name == '' && this.table.temp.infoCode == '') {
-        this.$message({ type: 'error', message: this.$t('message.msg240'), duration: 2000 })
+      } else if (
+        this.table.temp.Code == '' &&
+        this.table.temp.name == '' &&
+        this.table.temp.infoCode == ''
+      ) {
+        this.$message({
+          type: 'error',
+          message: this.$t('message.msg240'),
+          duration: 2000
+        })
         return false
       } else if (this.table.temp.name == '' && this.table.temp.infoCode == '') {
-        this.$message({ type: 'error', message: this.$t('message.msg241'), duration: 2000 })
+        this.$message({
+          type: 'error',
+          message: this.$t('message.msg241'),
+          duration: 2000
+        })
         return false
       } else if (this.table.temp.tclassid == '') {
-        this.$message({ type: 'error', message: this.$t('message.msg231'), duration: 2000 })
+        this.$message({
+          type: 'error',
+          message: this.$t('message.msg231'),
+          duration: 2000
+        })
         return false
       } else if (this.table.temp.name == '') {
-        this.$message({ type: 'error', message: this.$t('message.msg229'), duration: 2000 })
+        this.$message({
+          type: 'error',
+          message: this.$t('message.msg229'),
+          duration: 2000
+        })
         return false
       } else if (this.table.temp.Code == '') {
-        this.$message({ type: 'error', message: this.$t('message.msg242'), duration: 2000 })
+        this.$message({
+          type: 'error',
+          message: this.$t('message.msg242'),
+          duration: 2000
+        })
         return false
       } else if (this.table.temp.infoCode == '') {
-        this.$message({ type: 'error', message: this.$t('message.msg230'), duration: 2000 })
+        this.$message({
+          type: 'error',
+          message: this.$t('message.msg230'),
+          duration: 2000
+        })
         return false
       }
       const infoCode = /^([0-9]|(1[0-5]))$/
       if (!infoCode.test(parseInt(this.table.temp.infoCode))) {
-        this.$message({ type: 'error', message: this.$t('message.msg233'), duration: 2000 })
+        this.$message({
+          type: 'error',
+          message: this.$t('message.msg233'),
+          duration: 2000
+        })
         return false
       }
 
-      const pattern = new RegExp("[`~!@#$^&*()=|{}':;',\\[\\].<>/?~！@#￥……&*（）——|{}【】‘；：”“'。，、？]")
+      const pattern = new RegExp(
+        "[`~!@#$^&*()=|{}':;',\\[\\].<>/?~！@#￥……&*（）——|{}【】‘；：”“'。，、？]"
+      )
       console.log(this.table.temp.Code)
       if (pattern.test(this.table.temp.Code)) {
-        this.$message({ type: 'error', message: this.$t('message.msg243'), duration: 2000 })
+        this.$message({
+          type: 'error',
+          message: this.$t('message.msg243'),
+          duration: 2000
+        })
         return false
       }
       if (pattern.test(this.table.temp.name)) {
-        this.$message({ type: 'error', message: this.$t('message.msg243'), duration: 2000 })
+        this.$message({
+          type: 'error',
+          message: this.$t('message.msg243'),
+          duration: 2000
+        })
         return false
       }
 
@@ -382,23 +695,41 @@ export default {
       }, 1000)
       this.requestParam.name = 'updateTmrEquipment'
       this.requestParam.parammaps = this.table.temp
-      PostDataByName(this.requestParam).then(response => {
+      PostDataByName(this.requestParam).then((response) => {
         console.log('新增保存发送参数', this.requestParam)
         if (response.msg !== 'fail') {
-          this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
+          this.$notify({
+            title: this.$t('common.succes'),
+            message: this.$t('driver.saveSuccess'),
+            type: 'success',
+            duration: 2000
+          })
           this.getList()
         } else {
           const isRepeat = new RegExp('Duplicate entry :code')
           const isRepeat2 = new RegExp('Duplicate entry :infocode')
           if (isRepeat.test(response.data)) {
-            this.$notify({ type: 'error', message: this.$t('message.msg244'), duration: 2000 })
+            this.$notify({
+              type: 'error',
+              message: this.$t('message.msg244'),
+              duration: 2000
+            })
             return false
           }
           if (isRepeat2.test(response.data)) {
-            this.$notify({ type: 'error', message: this.$t('message.msg245'), duration: 2000 })
+            this.$notify({
+              type: 'error',
+              message: this.$t('message.msg245'),
+              duration: 2000
+            })
             return false
           }
-          this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
+          this.$notify({
+            title: this.$t('driver.saveFail'),
+            message: response.data,
+            type: 'warning',
+            duration: 2000
+          })
         }
       })
     },
@@ -416,25 +747,39 @@ export default {
 
     handleRowDelete(row) {
       console.log('点击了行内删除')
-      MessageBox.confirm( this.$t('common.delMsg'), {
-        confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
-      }).then(() => {
-        this.selectList = []
-        this.requestParam = {}
-        this.requestParam.name = 'deleteTmrEquipment'
-        this.requestParam.parammaps = {}
-        this.requestParam.parammaps.id = row.id
-        PostDataByName(this.requestParam).then(response => {
-          if (response.msg === 'fail') {
-            this.$notify({ title: this.$t('common.delfail'), message: response.data, type: 'warning', duration: 2000 })
-          } else {
-            this.$notify({ title: this.$t('common.succes'),message: this.$t('common.delSuccess'), type: 'success', duration: 2000 })
-            this.getList()
-          }
-        })
-      }).catch(() => {
-        this.$message({ type: 'info', message: this.$t('common.cancelMsg') })
+      MessageBox.confirm(this.$t('common.delMsg'), {
+        confirmButtonText: this.$t('common.confirm'),
+        cancelButtonText: this.$t('common.cancel'),
+        type: 'warning'
       })
+        .then(() => {
+          this.selectList = []
+          this.requestParam = {}
+          this.requestParam.name = 'deleteTmrEquipment'
+          this.requestParam.parammaps = {}
+          this.requestParam.parammaps.id = row.id
+          PostDataByName(this.requestParam).then((response) => {
+            if (response.msg === 'fail') {
+              this.$notify({
+                title: this.$t('common.delfail'),
+                message: response.data,
+                type: 'warning',
+                duration: 2000
+              })
+            } else {
+              this.$notify({
+                title: this.$t('common.succes'),
+                message: this.$t('common.delSuccess'),
+                type: 'success',
+                duration: 2000
+              })
+              this.getList()
+            }
+          })
+        })
+        .catch(() => {
+          this.$message({ type: 'info', message: this.$t('common.cancelMsg') })
+        })
     },
     handleSelectionChange(val) {
       console.log('勾选数据', val)
@@ -443,26 +788,54 @@ export default {
     form_delete() {
       console.log('点击了删除')
       if (this.selectList.length == 0) {
-        this.$message({ type: 'error', message: this.$t('message.msg246'), duration: 2000 })
+        this.$message({
+          type: 'error',
+          message: this.$t('message.msg246'),
+          duration: 2000
+        })
       } else {
-        MessageBox.confirm(this.$t('message.msg29')+ this.selectList.length + this.$t('message.msg31'), {
-          confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
-        }).then(() => {
+        MessageBox.confirm(
+          this.$t('message.msg29') +
+            this.selectList.length +
+            this.$t('message.msg31'),
+          {
+            confirmButtonText: this.$t('common.confirm'),
+            cancelButtonText: this.$t('common.cancel'),
+            type: 'warning'
+          }
+        ).then(() => {
           console.log(this.selectList)
           this.requestParam = {}
-          this.requestParam.common = { 'returnmap': '0' }
+          this.requestParam.common = { returnmap: '0' }
           this.requestParam.data = []
-          this.requestParam.data[0] = { 'name': 'insertSpotList', 'resultmaps': { 'list': this.selectList }}
+          this.requestParam.data[0] = {
+            name: 'insertSpotList',
+            resultmaps: { list: this.selectList }
+          }
           this.requestParam.data[0].children = []
-          this.requestParam.data[0].children[0] = { 'name': 'deleteTmrEquipment', 'type': 'e', 'parammaps': {
-            id: '@insertSpotList.id'
-          }}
-          ExecDataByConfig(this.requestParam).then(response => {
+          this.requestParam.data[0].children[0] = {
+            name: 'deleteTmrEquipment',
+            type: 'e',
+            parammaps: {
+              id: '@insertSpotList.id'
+            }
+          }
+          ExecDataByConfig(this.requestParam).then((response) => {
             console.log('删除保存发送参数', this.requestParam)
             if (response.msg === 'fail') {
-              this.$notify({ title: this.$t('common.delfail'), message: response.data, type: 'warning', duration: 2000 })
+              this.$notify({
+                title: this.$t('common.delfail'),
+                message: response.data,
+                type: 'warning',
+                duration: 2000
+              })
             } else {
-              this.$notify({ title: '',message: this.$t('common.delSuccess'), type: 'success', duration: 2000 })
+              this.$notify({
+                title: '',
+                message: this.$t('common.delSuccess'),
+                type: 'success',
+                duration: 2000
+              })
               this.getList()
             }
           })
@@ -473,6 +846,7 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-  .search{margin-top:10px;}
-
+.search {
+  margin-top: 10px;
+}
 </style>

src/views/formulationPlan/dailyExecutionPlan/typePage/surplusMaterialPlan.vue

@@ -463,9 +463,9 @@
     >
       <div class="check">
         <p v-if="check.temp.isDistribution == '0'">
-          当前有栏舍未分配，建议及时进行分配，未分配栏舍如下：
+          {{ $t('message.msg341') }}
         </p>
-        <p v-else>已分配完：当前栏舍已分配完善</p>
+        <p v-else>{{ $t('message.msg342') }}</p>
         {{ check.temp.bnames }}
       </div>
       <div slot="footer" class="dialog-footer" style="bottom: 10px">