瀏覽代碼

舍组栏页面添加了栏舍下拉接口,并修改了新增保存

段小段 1 年之前
父節點
當前提交
322f6638d6

+ 3 - 3
.env.development

@@ -6,19 +6,19 @@ ENV = 'development'
 # VUE_APP_BASE_API = 'http://210.16.189.72:8081/'
 
 
-VUE_APP_BASE_API = 'http://kpttest.kptyun.com/'
+# VUE_APP_BASE_API = 'http://kpttest.kptyun.com/'
 
 # VUE_APP_BASE_API = 'http://tmrwatch.cn/'
 
 # 测试线
-# VUE_APP_BASE_API = 'http://tmrwatch.cn:8081/'
+VUE_APP_BASE_API = 'http://tmrwatch.cn:8081/'
 
 # VUE_APP_BASE_API = 'http://127.0.0.1:8081/'
 
 # VUE_APP_BASE_API = 'http://lhpc81.kptyun.com/'
 
 
- 
+
 # 白少杰
 # VUE_APP_BASE_API = 'http://192.168.1.77:8081/'
 

二進制
dist-TMR-本地地址-20230112-1.zip


二進制
dist-TMR-本地地址-20230301-1.zip


二進制
dist-TMR-本地地址-20230323-1.zip


二進制
dist-TMR-测试地址-20221122-1.zip


二進制
dist-TMR-测试地址-20221122-2.zip


二進制
dist-TMR-测试地址-20221122-3.zip


二進制
dist-TMR-测试地址-20230106-1.zip


二進制
dist-TMR-测试地址-20230322-1.zip


二進制
dist-TMR-测试地址-20230322-2.zip


+ 18 - 7
src/views/basicData/groupColumn/index.vue

@@ -92,6 +92,14 @@
               <!-- <el-option v-for="item in jumpDelayList" :key="item.label" :label="item.label" :value="item.label" /> -->
             </el-select>
           </template>
+        </el-table-column>
+        <el-table-column label="栏舍" min-width="150px" align="center">
+          <template slot-scope="scope">
+            <span v-if="scope.row.NoEdit">{{ scope.row.KTEXT }}</span>
+            <el-select v-if="scope.row.Edit" v-model="scope.row.AUFNR" filterable class="filter-item" style="width: 95%;padding:10px 0;">
+              <el-option v-for="item in cattleorderList" :key="item.AUFNR" :label="item.KTEXT" :value="item.AUFNR" />
+            </el-select>
+          </template>
         </el-table-column>
         <el-table-column label="确认开始" min-width="110px" align="center">
           <template slot-scope="scope">
@@ -143,13 +151,14 @@ export default {
       requestParams: [
         { name: 'getDictByName', offset: 0, pagecount: 0, params: ['跳转延时'] },
         { name: 'getBarClass', offset: 0, pagecount: 0, parammaps: {pastureid: Cookies.get('pastureid')} },
-        { name: 'getScopeherd', offset: 0, pagecount: 0, parammaps: {pastureid: Cookies.get('pastureid')} }
+        { name: 'getScopeherd', offset: 0, pagecount: 0, parammaps: {pastureid: Cookies.get('pastureid')} },
+        { name: 'getCattleorder', offset: 0, pagecount: 0, parammaps: {pastureid: Cookies.get('pastureid')} }
       ],
       enableList: [{ id: '1', name: '是' }, { id: '0', name: '否' }],
       jumpDelayList: [],
       barClassList:[],
       scopeherdList:[],
-
+      cattleorderList:[],
       table: {
         getdataListParm: {
           name: 'getBarList',
@@ -214,7 +223,8 @@ export default {
       GetDataByNames(this.requestParams).then(response => {
         this.jumpDelayList = response.data.getDictByName.list
         this.barClassList = response.data.getBarClass.list
-        this.scopeherdList = response.data.getScopeherd.list
+        this.scopeherdList = response.data.getScopeherd.list
+        this.cattleorderList = response.data.getCattleorder.list
       })
     },
     getList() {
@@ -295,8 +305,8 @@ export default {
         this.table.temp.autosecondname = row.autosecondname
       } else {
         this.table.temp.autosecondname = this.table.temp.autosecondname
-      }
-
+      }
+      this.table.temp.AUFNR = row.AUFNR
       this.table.temp.isstart = row.isstart
       this.table.temp.enable = row.enable
       // 检验用户名称/角色是否为空
@@ -310,7 +320,7 @@ export default {
         this.$message({ type: 'error', message: '栏舍编号不能为空', duration: 2000 })
         return false
       }
-      
+
       // if (this.table.temp.bcode.length > 8) {
       //   this.$message({ type: 'error', message: '栏舍编号请输入1-8位数字', duration: 2000 })
       //   return false
@@ -407,7 +417,8 @@ export default {
       this.table.temp.autosecondname = this.table.temp.autosecondname
       this.table.temp.isstart = row.isstart
       this.table.temp.enable = row.enable
-      this.table.temp.id = row.id
+      this.table.temp.id = row.id
+      this.table.temp.AUFNR = row.AUFNR
       // 检验用户名称/角色是否为空
       if (this.table.temp.bname == '' && this.table.temp.bcode == '') {
         this.$message({ type: 'error', message: '栏舍名称/栏舍编号不能为空', duration: 2000 })