Merge branch 'dev' of http://git.patzn.com/wangweidong/pt-cloud-service-soil-web into dev

pages/soil-record-template-manage/ConfigTemplateEdit.vue

 <template>
   <div>
-    <Modal v-model="showModal" :mask-closable="false" @on-visible-change="_visibleChange" width="900">
+    <Modal v-model="showModal" :mask-closable="false" width="900" @on-visible-change="_visibleChange">
       <p slot="header">{{modalTitle}}</p>
       <div>
-        <Form ref="formObj" :id="formId" :model="formObj" :rules="ruleValidate" :label-width="100" inline>
+        <Form :id="formId" ref="formObj" :model="formObj" :rules="ruleValidate" :label-width="100" inline>
               <div>
                 <Form-item label="属性名称" prop="attributeName" class="width-48">
                   <Input v-model="formObj.attributeName" name="attributeName" placeholder="请输入属性名称"/>
@@ -19,47 +19,47 @@
                 <Form-item label="列位置" prop="columnPlace" class="width-48">
                   <Input
                     v-model="formObj.columnPlace"
-                    @keydown.native="channelInputLimit"
                     name="columnPlace"
                     type="number"
                     onmousewheel="return false"
                     placeholder="请输入列位置"
+                    @keydown.native="channelInputLimit"
                   ></Input>
                 </Form-item>
 
                 <Form-item label="合并开始列" prop="mergeBegin" class="width-48">
                   <Input
                     v-model="formObj.mergeBegin"
-                    @keydown.native="channelInputLimit"
                     name="mergeBegin"
                     type="number"
                     onmousewheel="return false"
                     placeholder="请输入合并开始列"
+                    @keydown.native="channelInputLimit"
                   />
                 </Form-item>
 
                 <Form-item label="合并结束列" prop="mergeEnd" class="width-48">
                   <Input
                     v-model="formObj.mergeEnd"
-                    @keydown.native="channelInputLimit"
                     name="mergeEnd"
                     type="number"
                     onmousewheel="return false"
                     placeholder="请输入合并结束列"
+                    @keydown.native="channelInputLimit"
                   />
                 </Form-item>
                 <Form-item label="合并行数" prop="mergeRowNum" class="width-48">
                   <Input
                     v-model="formObj.mergeRowNum"
-                    @keydown.native="channelInputLimit"
                     name="mergeRowNum"
                     type="number"
                     onmousewheel="return false"
                     placeholder="请输入合并行数"
+                    @keydown.native="channelInputLimit"
                   />
                 </Form-item>
                 <Form-item label="是否是项目指标" prop="itemed" class="width-48">
-                  <Select v-model="formObj.itemed"  @change="_optionChange" placeholder="请选择">
+                  <Select v-model="formObj.itemed"  placeholder="请选择" @change="_optionChange">
                     <Option
                       v-for="(item,index) in options"
                       :key="index"
@@ -68,6 +68,20 @@
                     />
                   </Select>
                 </Form-item>
+
+
+                <Form-item label="是否天平取值" prop="clicked" class="width-48">
+                  <Select v-model="formObj.clicked"  placeholder="请选择" @change="_clickedChange">
+                    <Option
+                      v-for="(item,index) in options"
+                      :key="index"
+                      :label="item.value"
+                      :value="index"
+                    />
+                  </Select>
+                </Form-item>
+
+
                 <Form-item label="单位" prop="unit" class="width-48">
                   <Input v-model="formObj.unit" name="unit"
                          placeholder="请输入单位"/>
@@ -76,7 +90,7 @@
         </Form>
       </div>
       <div slot="footer">
-        <modal-footer ref="footerModal" @on-result-change="_footerResult" :footer="footerList"></modal-footer>
+        <modal-footer ref="footerModal" :footer="footerList" @on-result-change="_footerResult"></modal-footer>
       </div>
     </Modal>
   </div>
@@ -109,7 +123,8 @@ export default {
         mergeBegin: '',
         mergeRowNum: '',
         mergeEnd: '',
-        itemed: undefined
+        itemed: undefined,
+        clicked: undefined
       },
       options: [
         {
@@ -222,6 +237,12 @@ export default {
       this.formObj.itemed = data
       console.log(this.formObj.itemed)
     },
+
+    _clickedChange(data) {
+      this.formObj.clicked = data
+      console.log(this.formObj.clicked)
+    },
+
     _ok() {
       this.$refs.formObj.validate(valid => {
         if (valid) {
@@ -229,11 +250,13 @@ export default {
           if (this.$string(this.id).isEmpty()) {
             data.templateId = this.templateId
             data.itemed = this.formObj.itemed
+            data.clicked = this.formObj.clicked
             // 添加
             this._save(data)
           } else {
             // 编辑
             data.itemed = this.formObj.itemed
+            data.clicked = this.formObj.clicked
             this._edit({ id: this.formObj.id, obj: data })
           }
         } else {

pages/soil-record-template-manage/SoilRecordTemplateEdit.vue

@@ -94,7 +94,7 @@ export default {
       action: '',
       isLoad: false,
       isDisable: true,
-      format: ['docx', 'xlsx', 'xls']
+      format: ['docx', 'xlsx', 'xls', 'xlsm']
     }
   },
   methods: {