apply-clients 3.3.222 → 3.4.2-FuGu-4

package/src/components/product/Process/Processes/devicesManagement.vue

@@ -72,6 +72,18 @@
               @click.prevent="deleteDevicesinfo(i)"
             >删除</button></div>
           </div>
+          <div class="form-group col-sm-6">
+            <label class="col-sm-4 control-label">设备品牌：</label>
+            <div class="col-sm-8">
+              <input-select
+                class="select select_list"
+                :value.sync="item.f_brand"
+                v-model="item.f_brand"
+                :options="brandList"
+                :disable="mark === 1"
+                :valueSingle="true"></input-select>
+            </div>
+          </div>
           <div class="form-group col-sm-6">
             <label class="col-sm-4 control-label">设备类型：</label>
             <div class="col-sm-8">
@@ -113,7 +125,7 @@
               <input class="form-control input_view" style=""
                      placeholder="安装人"
                      v-model="item.f_input_person"
-                     :value="installperson"
+                     :value.sync="installperson(item.f_input_person)"
                      readonly/>
             </div>
           </div>
@@ -404,7 +416,12 @@ export default {
   computed: {
     // 安装人
     installperson() {
-      return this.$login.f.name
+      return function (f_input_person) {
+        if (isEmpty(f_input_person)) {
+          return this.$login.f.name
+        }
+        return f_input_person
+      }
     },
     installdate() {
       return function (f_install_date) {
@@ -428,6 +445,9 @@ export default {
     },
     devicesType() {
       return this.$appdata.getParam("设备类型")
+    },
+    brandList() {
+      return this.$appdata.getParam("设备品牌")
     }
   },
   watch: {

package/src/components/product/Process/Processes/selectApply.vue

@@ -1,6 +1,6 @@
 <template>
   <div style="margin-bottom: 20px" class="form-group select-overspread">
-    <label class="control-label-justify control-label col-sm-3">选择终止报建</label>
+    <label class="control-label-justify control-label col-sm-3">选择项目</label>
     <div class="col-sm-10" >
       <button class="button_search button_spacing" type="button" style="width: max-content;position: absolute" @click="openSelect" :disabled="mark === 1">选择</button>
     </div>