sr пре 4 година
родитељ
комит
d67d0c5a68

+ 2 - 1
ruoyi-ui/src/settings.js

@@ -1,6 +1,7 @@
 module.exports = {
   title: '招商引资管理系统',
-  urls: 'http://47.99.82.249:80',
+  // urls: 'http://47.99.82.249:80',
+  urls: 'http://192.168.101.11:8010',
 
   /**
    * 侧边栏主题 深色主题theme-dark,浅色主题theme-light

+ 53 - 5
ruoyi-ui/src/views/management/info/index.vue

@@ -92,11 +92,55 @@
           </el-checkbox-group>
         </el-form-item>
         <el-form-item label="所属行业:" prop="industry">
-          <el-radio-group v-model="xs_form.industry">
-            <el-radio :label="item.dictValue" v-for="(item,index) in industryOptions" :key="index">
-              {{item.dictLabel}}
-            </el-radio>
-          </el-radio-group>
+            <el-row>
+              <el-col :span="4" style="font-weight: bold;">
+                工业项目
+              </el-col>
+              <el-col :span="20">
+              <el-radio-group v-model="xs_form.industry">
+               <el-radio :label="item.dictValue" v-for="(item,index) in industryOptions.filter(res => {
+                 if(res.dictValue.substring(0,1) == '1'){
+                   return res
+                 }
+               })" :key="index">
+                  {{item.dictLabel}}
+                </el-radio>
+              </el-radio-group>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="4" style="font-weight: bold;">
+                服务业项目
+              </el-col>
+              <el-col :span="20">
+              <el-radio-group v-model="xs_form.industry">
+               <el-radio :label="item.dictValue" v-for="(item,index) in industryOptions.filter(res => {
+                 if(res.dictValue.substring(0,1) == '2'){
+                   return res
+                 }
+               })" :key="index">
+                  {{item.dictLabel}}
+                </el-radio>
+              </el-radio-group>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="4" style="font-weight: bold;">
+                总部经济项目
+              </el-col>
+              <el-col :span="20">
+              <el-radio-group v-model="xs_form.industry">
+               <el-radio :label="item.dictValue" v-for="(item,index) in industryOptions.filter(res => {
+                 if(res.dictValue.substring(0,1) == '3'){
+                   return res
+                 }
+               })" :key="index">
+                  {{item.dictLabel}}
+                </el-radio>
+              </el-radio-group>
+              </el-col>
+            </el-row>
+
         </el-form-item>
         <el-form-item label="是否返乡:" prop="isBackbussiness">
           <el-select v-model="xs_form.isBackbussiness" placeholder="请选择状态" clearable size="small">
@@ -528,3 +572,7 @@
     }
   };
 </script>
+<style lang="scss" scoped>
+  .lab_box{
+  }
+</style>

+ 111 - 0
ruoyi-ui/src/views/management/roduction/index.vue

@@ -122,6 +122,66 @@
                   </div>
                 </div>
               </el-form-item>
+              <el-form-item label="设备订购合同:" class="maget_ty">
+                <div class="forieu" style="width: 618px">
+                  <div class="bure burert">
+                    <el-upload
+                      :action="defaultSettings.urls + process+'/common/upload'"
+                      list-type="picture-card"
+                      :on-preview="handlePictureCardPreview"
+                      :on-remove="handleRemove3"
+                      :on-success="handleOnsuccess3"
+                      :file-list="orderContractPhotoList"
+                       :disabled = "disfal"
+                    >
+                      <i class="el-icon-plus"></i>
+                      <!-- <el-button slot="trigger" size="small" type="primary"
+                        >选取文件</el-button
+                      >
+                      <el-button
+                        style="margin-left: 10px"
+                        size="small"
+                        type="primary"
+                        @click="submitUpload"
+                        >上传到服务器</el-button
+                      > -->
+                    </el-upload>
+                    <el-dialog :visible.sync="dialogVisible">
+                      <img width="100%" :src="dialogImageUrl" alt="" />
+                    </el-dialog>
+                  </div>
+                </div>
+              </el-form-item>
+              <el-form-item label="到资清单:" class="maget_ty">
+                <div class="forieu" style="width: 618px">
+                  <div class="bure burert">
+                    <el-upload
+                      :action="defaultSettings.urls + process+'/common/upload'"
+                      list-type="picture-card"
+                      :on-preview="handlePictureCardPreview"
+                      :on-remove="handleRemove2"
+                      :on-success="handleOnsuccess2"
+                      :file-list="arrivalListPhotoList"
+                       :disabled = "disfal"
+                    >
+                      <i class="el-icon-plus"></i>
+                      <!-- <el-button slot="trigger" size="small" type="primary"
+                        >选取文件</el-button
+                      >
+                      <el-button
+                        style="margin-left: 10px"
+                        size="small"
+                        type="primary"
+                        @click="submitUpload"
+                        >上传到服务器</el-button
+                      > -->
+                    </el-upload>
+                    <el-dialog :visible.sync="dialogVisible">
+                      <img width="100%" :src="dialogImageUrl" alt="" />
+                    </el-dialog>
+                  </div>
+                </div>
+              </el-form-item>
               <el-form-item> </el-form-item>
               <el-form-item label=" 项目入规(限):" prop="isOk">
                 <el-select
@@ -189,6 +249,8 @@ export default {
       dialogImageUrl: false,
 
       productPhotoList: [],
+      arrivalListPhotoList: [],
+      orderContractPhotoList: [],
 
       //数据字典
       typeOptions: {},
@@ -231,9 +293,18 @@ export default {
     getProduct(that.bmProjectId).then((response) => {
       if (response.data) {
         that.form = response.data;
+        //  投产图片
         if (that.form.productPhoto.length > 0) {
           this.productPhotoList = JSON.parse(that.form.productPhoto);
         }
+        //  到资清单
+        if (that.form.arrivalListPhoto.length > 0) {
+          this.arrivalListPhotoList = JSON.parse(that.form.arrivalListPhoto);
+        }
+        //  设备订购合同
+        if (that.form.orderContractPhoto.length > 0) {
+          this.orderContractPhotoList = JSON.parse(that.form.orderContractPhoto);
+        }
       }
     });
   },
@@ -277,6 +348,8 @@ export default {
         okDate: null,
       };
       this.productPhotoList = [];
+      this.arrivalListPhotoList = [];
+      this.orderContractPhotoList = [];
     },
     //上传图片
     handleSuccpermit(response, file, fileList) {
@@ -311,6 +384,14 @@ export default {
         this.msgError("请先选择投产图片");
         return;
       }
+      if (this.arrivalListPhotoList.length == 0) {
+        this.msgError("请先选择到资清单图片");
+        return;
+      }
+      if (this.orderContractPhotoList.length == 0) {
+        this.msgError("请先选择设备订购合同图片");
+        return;
+      }
       this.productPhotoList.forEach((item, index) => {
         var obj = {};
         obj.name = item.response.fileName;
@@ -320,6 +401,24 @@ export default {
       });
       this.form.productPhoto = JSON.stringify(tmp);
 
+      this.arrivalListPhotoList.forEach((item, index) => {
+        var obj = {};
+        obj.name = item.response.fileName;
+        obj.uid = item.uid;
+        obj.url = item.response.url;
+        tmp[index] = obj;
+      });
+      this.form.arrivalListPhoto = JSON.stringify(tmp);
+
+      this.orderContractPhotoList.forEach((item, index) => {
+        var obj = {};
+        obj.name = item.response.fileName;
+        obj.uid = item.uid;
+        obj.url = item.response.url;
+        tmp[index] = obj;
+      });
+      this.form.orderContractPhoto = JSON.stringify(tmp);
+
       this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {
@@ -347,6 +446,18 @@ export default {
     handleRemove(file, fileList) {
       this.productPhotoList = fileList;
     },
+    handleOnsuccess2(response, file, fileList) {
+      this.arrivalListPhotoList = fileList;
+    },
+    handleRemove2(file, fileList) {
+      this.arrivalListPhotoList = fileList;
+    },
+    handleOnsuccess3(response, file, fileList) {
+      this.orderContractPhotoList = fileList;
+    },
+    handleRemove3(file, fileList) {
+      this.orderContractPhotoList = fileList;
+    },
     handlePictureCardPreview(file) {
       this.dialogImageUrl = file.url;
       this.dialogVisible = true;

+ 1 - 1
ruoyi-ui/src/views/management/row/index.vue

@@ -13,7 +13,7 @@
         <div class="naue_one">
           <p class="naue_name">项目名称:{{oekjg.name == null ? '' : oekjg.name}}</p>
           <p>返乡创业:{{oekjg.isBackbussiness == "Y"? '是' : '否'}}</p>
-          <p>所属业:{{oekjg.industry == null ? '' : oekjg.industry}}</p>
+          <p>所属业:{{oekjg.industry == null ? '' : oekjg.industry}}</p>
         </div>
         <div class="naue_two">
           <el-steps :active="naueactive" align-center finish-status="success">

+ 1 - 1
ruoyi-ui/src/views/statistical/clue/index.vue

@@ -21,7 +21,7 @@
           </div>
           <div class="exl_box">
             <div class="exl_title">
-              <span>招资引资项目到资金额</span>
+              <span></span>
               <el-date-picker v-model="lb_value" style="width: 100px;" type="year" value-format="yyyy" @change="picher_fn"
                 placeholder="选择年">
               </el-date-picker>

+ 1 - 1
ruoyi-ui/src/views/statistical/putProduction/index.vue

@@ -21,7 +21,7 @@
           </div>
           <div class="exl_box">
             <div class="exl_title">
-              <span>招资引资项目到资金额</span>
+              <span></span>
               <el-date-picker v-model="lb_value" style="width: 100px;" type="year" value-format="yyyy" @change="picher_fn"
                 placeholder="选择年">
               </el-date-picker>

+ 1 - 1
ruoyi-ui/src/views/statistical/sign/index.vue

@@ -21,7 +21,7 @@
           </div>
           <div class="exl_box">
             <div class="exl_title">
-              <span>招资引资项目到资金额</span>
+              <span></span>
               <el-date-picker v-model="lb_value" style="width: 100px;" type="year" value-format="yyyy" @change="picher_fn"
                 placeholder="选择年">
               </el-date-picker>

+ 1 - 1
ruoyi-ui/src/views/statistical/underConstruction/index.vue

@@ -21,7 +21,7 @@
           </div>
           <div class="exl_box">
             <div class="exl_title">
-              <span>招资引资项目到资金额</span>
+              <span></span>
               <el-date-picker v-model="lb_value" style="width: 100px;" type="year" value-format="yyyy" @change="picher_fn"
                 placeholder="选择年">
               </el-date-picker>