更新5-13

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

@@ -1,17 +1,5 @@
 <template>
   <div class="app-container">
-    <div class="search">
-      <el-select
-        v-model="table.getdataListParm.parammaps.times"
-        filterable
-        placeholder="班次"
-        class="filter-item"
-        style="width: 120px;"
-        @change="changeFrequency"
-      >
-        <el-option v-for="item in frequencyList" :key="item.id" :label="item.name" :value="item.id" />
-      </el-select>
-    </div>
     <div class="operation">
       <el-button v-if="isRoleEdit" class="success" icon="el-icon-plus" style="float:left;" @click="handleCreate">新增车次
       </el-button>
@@ -32,7 +20,17 @@
       <el-button v-if="isRoleEdit" class="success" icon="el-icon-open" style="float: left;" @click="handleTakeEffect">
         生效</el-button>
       <el-button v-if="isRoleEdit" class="danger" icon="el-icon-turn-off" style="float: left;" @click="handleDisable">
-        禁用</el-button>
+        禁用</el-button>
+        <el-select
+          v-model="table.getdataListParm.parammaps.times"
+          filterable
+          placeholder="班次"
+          class="filter-item"
+          style="width: 120px;"
+          @change="changeFrequency"
+        >
+          <el-option v-for="item in frequencyList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
     </div>
     <div class="table">
       <el-table
@@ -606,7 +604,11 @@ export default {
         if (response.data !== null) {
           this.equipmentList = response.data.list
           if(this.create.dialogStatus == 'update'){
-            this.create.temp.tclassname = this.equipmentList.find(obj => obj.id ==  this.create.temp.tmrid).tclassname
+            if(this.equipmentList.find(obj => obj.id ==  this.create.temp.tmrid) !== undefined){
+              this.create.temp.tclassname = this.equipmentList.find(obj => obj.id ==  this.create.temp.tmrid).tclassname
+            }else{
+              this.create.temp.tclassname = '固定式'
+            }
           }
         } else {
           this.equipmentList = []
@@ -1444,6 +1446,7 @@ export default {
        data.parammaps.pastureid = obj.pastureid
        data.parammaps.lppid = obj.lppid
        data.parammaps.sort = evt.moved.newIndex +1
+       data.parammaps.id = obj.id
        data.parammaps.date = this.date
        postJson(url, data).then(response => {
          console.log('拖动保存发送参数', this.requestParam)

src/views/formulationPlan/materialIssuancePlan/historyRecord.vue

@@ -71,48 +71,18 @@
             <el-switch v-model="scope.row.issplit" :disabled="scope.row.NoEdit" active-color="#13ce66" inactive-color="#ff4949" :active-value="1" :inactive-value="0" disabled />
           </template>
         </el-table-column>
-        <el-table-column label="撒料" width="950px" align="center">
+        <el-table-column label="撒料" min-width="250px" align="left" header-align="center">
           <template slot-scope="scope">
-            <draggable id="2" data-source="juju" :list="scope.row.arrList" class="list-group2" draggable=".item" group="a" :move="move2" @change="changeLog2(scope.row)" @start="start2" @end="end2(scope.row)">
-              <div v-for="element in scope.row.arrList" :key="element.name" class="list-group-item2 item">
-                <div class="arr-l">
-                  <div class="arr-l-t">
-                    <div class="arr-l-t-t" />
-                    <el-select v-model="element.tmrid" placeholder="撒料设备" class="arr-l-t-b el-icon-arrow-down" @change="(value)=> {changeEquipment(value, scope.row,element.fttype,element.id)}">
-                      <el-option v-for="item in equipmentList" :key="item.id" :label="item.tmrmix" :value="item.id" />
-                    </el-select>
-                  </div>
-                  <div class="arr-l-b">
-                    <el-tooltip placement="top" class="list-group-item1 item" style="height: 18px;line-height: 18px;">
-                      <div slot="content">{{ element.tmrname }}</div>
-                      <div class="tmrname">{{ element.tmrname }}</div>
-                    </el-tooltip>
-                  </div>
+            <div v-for="element in scope.row.arrList" :key="element.name" class="list">
+              <el-tooltip placement="top" :open-delay="1000">
+                <div slot="content">
+                  <div> 栏舍全称：{{ element.barname }} </div>
+                  <div> 饲料重量：{{ element.weight }} </div>
+                  <!-- <div> 撒料车：{{ element.tmrname }} </div> -->
                 </div>
-                <div class="arr-r">
-                  <div class="arr-r-l">
-                    <el-tooltip placement="top">
-                      <div slot="content">{{ element.barname }}</div>
-                      <div class="barname">{{ element.barname }}</div>
-                    </el-tooltip>
-                  </div>
-                  <div class="arr-r-c">-</div>
-                  <div class="arr-r-r">
-                    <el-tooltip v-show="!element.isWeight" placement="top">
-                      <div slot="content">{{ element.weight }}</div>
-                      <div class="weight" @dblclick="dbclickWeight(element)">{{ element.weight }}</div>
-                    </el-tooltip>
-                    <el-tooltip v-show="element.isWeight" placement="top">
-                      <div slot="content">{{ element.weight }}</div>
-                      <input ref="weight" v-model="element.weight" v-focus="element.focusState" type="number" placeholder="重量" step="0.01" class="filter-item2" style="display: inline-block;height:16px;padding:4px 0px; font-size:12px;width: 95%;border: 1px solid #e6e6e6;" @blur="(value)=> {blurWeight(scope.row,element.fttype,element.id)}">
-                    </el-tooltip>
-                  </div>
-                </div>
-                <div class="arr-t" :style="{'background':element.background}">
-                  <i class="el-icon-close" style="position: absolute;right: 0;" @click="handleFLDelete(element,scope.row)" />
-                </div>
-              </div>
-            </draggable>
+                <div :style="{'background':element.background}" class="tmrname">{{ element.barname }}</div>
+              </el-tooltip>
+            </div>
           </template>
         </el-table-column>
       </el-table>
@@ -208,4 +178,9 @@ export default {
 
 <style  lang="scss" scoped>
  .search{margin-bottom: 10px;}
+ .list{width: 60px;display: inline-block;margin: 5px 5px;text-align: center;
+    .tmrname{
+      width:100%;padding: 5px 5px;overflow: hidden; text-overflow: ellipsis; white-space: nowrap;
+    }
+ }
 </style>

src/views/formulationPlan/materialIssuancePlan/index.vue

@@ -16,7 +16,9 @@
       <el-select v-model="table.getdataListParm.parammaps.times" filterable placeholder="班次" class="filter-item" style="width: 120px;float: left;margin-left: 10px;" @change="changeFrequency">
         <el-option v-for="item in frequencyList" :key="item.id" :label="item.name" :value="item.id" />
       </el-select>
-      <el-button class="export" icon="el-icon-time" style="float:right;" @click="handleHistoryRecord">历史记录 </el-button>
+      <!-- 临时注释 -->
+      <!-- <el-button class="export" icon="el-icon-time" style="float:right;" @click="handleHistoryRecord">历史记录 </el-button> -->
+      <!-- 临时注释 -->
     </div>
     <!-- <div class="search">
       <el-select v-model="table.getdataListParm.parammaps.times" filterable placeholder="班次" class="filter-item" style="width: 120px;" @change="changeFrequency">
@@ -517,7 +519,11 @@ export default {
         if (response.data !== null) {
           this.equipmentList = response.data.list
           if(this.create.dialogStatus == 'update'){
-            this.create.temp.tclassname = this.equipmentList.find(obj => obj.id ==  this.create.temp.tmrid).tclassname
+            if(this.equipmentList.find(obj => obj.id ==  this.create.temp.tmrid) !== undefined){
+              this.create.temp.tclassname = this.equipmentList.find(obj => obj.id ==  this.create.temp.tmrid).tclassname
+            }else{
+              this.create.temp.tclassname = '固定式'
+            }
           }
         } else {
           this.equipmentList = []
@@ -933,8 +939,9 @@ export default {
       setTimeout(() => {
         this.isokDisable = false
       }, 1000)
-      console.log('点击了栏舍item==>', item)
       this.create.temp.sumweight = parseFloat(this.create.temp.sumweight)
+      console.log('this.TMRNumberList==>', this.TMRNumberList)
+      console.log('点击了栏舍item==>', item)
       console.log('temp==>',this.create.temp)
       console.log('this.equipmentList==>',this.equipmentList)
       // if(this.create.temp.tclassname == '固定式'){
@@ -1006,12 +1013,12 @@ export default {
         //   }
         // }
         // ExecDataByConfig(this.requestParam).then(response => {
-          this.requestParam = {}
-          this.requestParam.common = { 'returnmap': '0' }
-          this.requestParam.data = []
-          this.requestParam.data[0] = { 'name': 'updateFpdetailUse', 'type': 'e',
-            'parammaps': { pastureid: item.pastureid, id: item.id, fttype: item.fttype, lweight: item.weight }
-          }
+        this.requestParam = {}
+        this.requestParam.common = { 'returnmap': '0' }
+        this.requestParam.data = []
+        this.requestParam.data[0] = { 'name': 'updateFpdetailUse', 'type': 'e',
+          'parammaps': { pastureid: item.pastureid, id: item.id, fttype: item.fttype, lweight: item.weight }
+        }
         const url2 = 'authdata/ExecDataByConfig'
         const data2 = this.requestParam
         postJson(url2, data2).then(response => {
@@ -1165,6 +1172,7 @@ export default {
       data.parammaps.pastureid = obj.pastureid
       data.parammaps.lppid = obj.lppid
       data.parammaps.sort = evt.moved.newIndex +1
+      data.parammaps.id = obj.id
       postJson(url, data).then(response => {
         console.log('拖动保存发送参数', this.requestParam)
         if (response.msg === 'fail') {

src/views/inventoryManagement/warehousing/index.vue

@@ -11,7 +11,7 @@
         <el-option v-for="item in supplierList" :key="item.id" :label="item.providerName" :value="item.id" />
       </el-select>
       <el-select v-model="table.getdataListParm.parammaps.islaid" placeholder="是否入库" class="filter-item" style="width: 150px;" clearable>
-        <el-option v-for="item in islaidList" :key="item.id" :label="item.name" :value="item.name" />
+        <el-option v-for="item in islaidList" :key="item.id" :label="item.name" :value="item.id" />
       </el-select>
       <el-button class="successBorder" @click="handleSearch">查询</el-button>
       <el-button class="successBorder" @click="handleRefresh">重置</el-button>
@@ -338,7 +338,7 @@ export default {
       feedNameAddList: [], // 饲料名称新增
       supplierList: [], // 供应商
       contractNoList: [], // 合同编号
-      islaidList: [{ id: 0, name: '是' }, { id: 1, name: '否' }], // 是否入库
+      islaidList: [{ id: 0, name: '已入库' }, { id: 1, name: '未入库' }], // 是否入库
       requestParams: [
         { name: 'getFeedListEnable', offset: 0, pagecount: 0, parammaps: { pastureid: Cookies.get('pastureid') }},
         { name: 'getProviderListEnable', offset: 0, pagecount: 0, parammaps: { pastureid: Cookies.get('pastureid') }}

src/views/inventoryManagement/warehousing/index改.vue

@@ -11,7 +11,7 @@
         <el-option v-for="item in supplierList" :key="item.id" :label="item.providerName" :value="item.id" />
       </el-select>
       <el-select v-model="table.getdataListParm.parammaps.islaid" placeholder="入库状态" class="filter-item" style="width: 150px;" clearable>
-        <el-option v-for="item in islaidList" :key="item.id" :label="item.name" :value="item.name" />
+        <el-option v-for="item in islaidList" :key="item.id" :label="item.name" :value="item.id" />
       </el-select>
       <el-button class="successBorder" @click="handleSearch">查询</el-button>
       <el-button class="successBorder" @click="handleRefresh">重置</el-button>