Merge branch 'develop' into developer/yanjiaxu

src/api/system/sample.js

@@ -66,3 +66,11 @@ export function selectDataStatistics(data){
     data: data
   })
 }
+
+export function componentSelect(data){
+  return request({
+    url:'/system/enterprise/list',
+    method: 'post',
+    data: data
+  })
+}

src/views/setting/sample/index.vue

@@ -274,14 +274,20 @@
           >
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="生产企业" prop="manufacturingEnterprise">
-          <el-input
-            v-model="editParamsForm.manufacturingEnterprise"
-            placeholder="请输入生产企业"
-            clearable
-            maxlength="50"
+        <el-form-item label="生产企业" prop="manufacturingEnterpriseId">
+          <el-select
+            v-model="editParamsForm.manufacturingEnterpriseId"
+            placeholder="请选择"
             style="width: 90%"
-          />
+          >
+            <el-option
+              v-for="item in componentSelect"
+              :key="item.id"
+              :label="item.enterpriseName"
+              :value="item.id"
+            >
+            </el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="商标" prop="trademark">
           <image-upload
@@ -390,6 +396,7 @@ import {
 import MaterialLibrary from '@/views/setting/materialLibrary/index.vue'
 import materialLibrary from '@/views/setting/materialLibrary/index.vue'
 import { isExternal } from '@/utils/validate'
+import { componentSelect } from '../../../api/system/sample'
 
 export default {
   components: { MaterialLibrary },
@@ -425,8 +432,8 @@ export default {
         manufactureDate: [
           { required: true, message: '请选择生产日期', trigger: 'change' }
         ],
-        manufacturingEnterprise: [
-          { required: true, message: '请输入生产企业', trigger: 'blur' }
+        manufacturingEnterpriseId: [
+          { required: true, message: '请选择生产企业', trigger: 'change' }
         ]
       },
       editParamsForm: {
@@ -454,7 +461,8 @@ export default {
       dialogVisible: false,
       trademarkDisplay: true,
       dialogTitle: '新建',
-      samplePhotosDisplay: true
+      samplePhotosDisplay: true,
+      componentSelect: []
     }
   },
   computed: {
@@ -484,8 +492,20 @@ export default {
   },
   created() {
     this.getList()
+    this.getComponentSelect()
   },
   methods: {
+    getComponentSelect() {
+      componentSelect({
+        pageNum: 1,
+        pageSize: 9999,
+        isAsc: 'desc',
+        orderByColumn: 'createTime'
+      }).then(res => {
+        this.componentSelect = res.rows
+        console.log('res', res)
+      })
+    },
     closeMaterial(data) {
       this.materialShow = data
     },

src/views/task/edit/index.vue

@@ -4,6 +4,10 @@
       <div class="tip-navigation">
         <div class="tip"></div>
         <div class="tip-title">任务信息</div>
+        <div class="left-back" @click="backPage">
+          <icon-park type="left" size="14" fill="#1a6fd7" />
+          <span class="return-button">取消</span>
+        </div>
       </div>
       <div class="global-left-margin">
         <el-row :gutter="20">
@@ -998,6 +1002,9 @@ export default {
       // 去掉一个数组最后一个对象
       this.tableData.pop()
     },
+    backPage() {
+      this.$router.go(-1)
+    },
     /**
      * 添加小组成员点击按钮
      */
@@ -1232,6 +1239,17 @@ export default {
     font-weight: 700;
     color: #1a6fd7;
   }
+
+  .left-back {
+    position: absolute;
+    right: 2%;
+    display: flex;
+    color: #1a6fd7;
+    cursor: pointer;
+    .return-button {
+      padding-left: 7px;
+    }
+  }
 }
 
 .sortable-handle {