Merge remote-tracking branch 'origin/dev' into dev

config/dev.env.js

@@ -6,6 +6,7 @@ module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
   // BASE_API: '"http://172.16.90.3:9098/forest-admin"'//邱波电脑
   // BASE_API: '"http://172.16.90.64:9098/forest-admin"'
+  BASE_API: '"http://172.16.90.50:9098/forest-admin"'//邱波
   // BASE_API: '"http://172.16.90.8:9098/forest-admin"'//东东
-  BASE_API: '"http://172.16.90.43:9098/forest-admin"'//东东
+  // BASE_API: '"http://172.16.90.43:9098/forest-admin"'//东东
 })

config/index.js

@@ -13,9 +13,9 @@ module.exports = {
     proxyTable: {},
 
     // Various Dev Server settings
-    host: '172.16.90.25', // can be overwritten by process.env.HOST
+    host: '0.0.0.0', // can be overwritten by process.env.HOST
     port: 8090, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
-    autoOpenBrowser: false,
+    autoOpenBrowser: true,
     errorOverlay: true,
     notifyOnErrors: true,
     disableHostCheck: true,

src/api/origin.js

@@ -37,3 +37,34 @@ export function updateOrigin(id,data) {
   })
 }
 
+//生产地产出物管理
+export function originProductList(data) {
+  return request({
+    url:'/originProduct/list',
+    method:'post',
+    data:data
+  })
+}
+export function createOriginProduct(data) {
+  return request({
+    url:'/originProduct/save',
+    method:'post',
+    data:data
+  })
+}
+
+
+export function deleteOriginProduct(id) {
+  return request({
+    url:'/originProduct/delete?'+id,
+    method:'get',
+  })
+}
+
+export function updateOriginProduct(id,data) {
+  return request({
+    url:'/originProduct/update',
+    method:'post',
+    data:data
+  })
+}

src/views/pms/origin/components/originDetail.vue

@@ -40,9 +40,44 @@
           v-model="origin.summary"
           :autosize="true"></el-input>
       </el-form-item>
-      <el-form-item label="产出物">
-        <el-input v-model="origin.isCert"></el-input>
-      </el-form-item>
+      <!-- <el-form-item label="产出物">
+        <div style="text-align: right;"><el-button size="mini" class="btn-add" @click="handleAddOriginProduct()">添加</el-button></div>
+        <div class="table-container">
+          <el-table ref="roleTable"
+                :data="originProductList"
+                style="width: 100%;"
+                v-loading="originProductListLoading" border>
+              <el-table-column label="产出物名称" width="100px" show-overflow-tooltip align="center">
+                <template slot-scope="scope">{{scope.row.productName}}</template>
+              </el-table-column>
+              <el-table-column label="面积（亩）"  show-overflow-tooltip align="center">
+                <template slot-scope="scope">{{scope.row.plantArea}}</template>
+              </el-table-column>
+              <el-table-column label="可用状态"  show-overflow-tooltip align="center">
+                <template slot-scope="scope">
+                  <span v-if="scope.row.state ==0">可用</span>
+                  <span v-else-if="scope.row.state ==1">禁用</span>
+                  <span v-else-if="scope.row.state ==2">删除</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="操作" width="160" align="center">
+                <template slot-scope="scope">
+                  <el-row>
+                  <el-button size="mini"
+                            type="text"
+                            @click="handleUpdateOriginProduct(scope.$index, scope.row)">
+                    编辑
+                  </el-button>
+                  <el-button size="mini"
+                            type="text"
+                            @click="handleDeleteOriginProduct(scope.$index, scope.row)">删除
+                  </el-button>
+                  </el-row>
+                </template>
+              </el-table-column>
+          </el-table>
+        </div>
+      </el-form-item> -->
       <el-form-item label="产出物种植面积（亩）">
         <el-input v-model="origin.originArea"></el-input>
       </el-form-item>
@@ -94,6 +129,7 @@
 </template>
 <script>
   import {createOrigin, getOrigin, updateOrigin} from '@/api/origin'
+  import {originProductList as fetchOriginProductList, createOriginProduct, updateOriginProduct,deleteOriginProduct} from '@/api/origin'
   import SingleUpload from '@/components/Upload/singleUpload'
   import MultiUpload from '@/components/Upload/multiUpload'
   import {bMapTransQQMap,qqMapTransBMap} from '@/utils/index';
@@ -168,6 +204,8 @@
             {required: true, message: '请选择经纬度', trigger: 'blur'}
           ],
         },
+        originProductList:[],
+        originProductListLoading:false,
         center: {lng: 106.632713, lat: 26.653157},
         zoom: 12,
         mapVisible:false,
@@ -226,9 +264,38 @@
         });
       }else{
         this.origin = Object.assign({},defaultorigin);
-      }
+      };
+      this.getoriginProductList();
+
     },
     methods: {
+      //产出物列表
+      getoriginProductList(){
+        this.originProductListLoading = true;
+        fetchOriginProductList({"pageNum": 1,"pageSize": 100,"fkOriginId":300}).then(response => {
+          this.originProductListLoading = false;
+          console.log('originProductList',JSON.parse(JSON.stringify(response)));
+          this.originProductList = response.data.list;
+
+        }).catch(err => {
+          this.originProductListLoading = false;
+        });
+
+      },
+      // 新增产出物
+      handleAddOriginProduct(){
+        console.log('新增产出物');
+      },
+      // 修改产出物
+      handleUpdateOriginProduct(index,data){
+        console.log('修改产出物inex',index);
+        console.log('修改产出物data',data);
+      },
+      // 删除产出物
+      handleDeleteOriginProduct(index,data){
+        console.log('删除产出物inex',index);
+        console.log('删除产出物data',data);
+      },
       onSubmit(formName) {
         // console.log('this.origin',JSON.parse(JSON.stringify(this.origin)))
         // return false;
@@ -287,10 +354,10 @@
           geolocation.getCurrentPosition(function(r){
             // console.log(r);
             _this.center = {lng: r.longitude, lat: r.latitude};		// 设置center属性值
-            console.log('_this.center',_this.origin);
+            // console.log('_this.center',_this.origin);
             if(_this.origin.latitude&&_this.origin.longitude){
               let transqq = qqMapTransBMap(_this.origin.longitude,_this.origin.latitude);
-              console.log('transqq',transqq);
+              // console.log('transqq',transqq);
               _this.center = {lng:transqq.lng, lat: transqq.lat};
             };
             let Icon_0 = new BMap.Icon("static/zuobiao.gif", new BMap.Size(64, 64), {anchor: new BMap.Size(18, 32),imageSize: new BMap.Size(36, 36)});

src/views/pms/product/components/ProductInfoDetail.vue

@@ -28,6 +28,21 @@
           </el-option>
         </el-select>
       </el-form-item>
+      <el-form-item label="供应商：" prop="compId">
+        <el-select
+          filterable
+          v-model="value.compId"
+          @change="handleSupplierChange"
+          placeholder="请选择供应商"
+        >
+          <el-option
+            v-for="item in supplierOptList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          ></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item label="生产地：" prop="placeOfProductionId">
         <el-select
         filterable
@@ -201,6 +216,12 @@
           }
         });
       },
+      /** 获取供应商下拉列表 */
+      getSupplierOptList() {
+        selectCompList().then(response => {
+          this.supplierOptList = response.data;
+        });
+      },
       getOriginList() {
         fetchOriginList({pageNum: 1, pageSize: 100}).then(response => {
           // console.log('getOriginList',response);
@@ -258,6 +279,13 @@
         }
         this.value.brandName = brandName;
       },
+      handleSupplierChange(val) {
+        let supplierInfoObj = {};
+        supplierInfoObj = this.supplierOptList.find(item => {
+          return item.value === val;
+        });
+        this.value.compName = supplierInfoObj.label;
+      },
       handleOriginChange(val) {
         let placeOfProduction = '';
         for (let i = 0; i < this.originOptions.length; i++) {