Merge branch 'release' into 'feature/ljq'

新增问卷id

See merge request !4

src/views/protocol/create-protocol.vue

@@ -20,7 +20,10 @@
           <!-- <el-input v-model="ruleForm.protocolName" maxlength="30" show-word-limit></el-input> -->
         </el-form-item>        
         <el-form-item label="腾讯问卷id" >
-          <el-input size="small" v-model="ruleForm.txWenJuanId" style="widht:200px;" ></el-input>
+          <div style="display:flex">
+            <el-input size="small" v-model="ruleForm.txWenJuanId" style="flex:1" ></el-input>
+            <span style="flex:1 ; color: #ee8f4f;margin-left: 20px;">注：腾讯问卷id和协议内容二选一</span>
+          </div>
           <!-- <el-input v-model="ruleForm.protocolName" maxlength="30" show-word-limit></el-input> -->
         </el-form-item>     
         <el-form-item label="协议内容">

src/views/protocol/protocol-detail.vue

@@ -16,9 +16,12 @@
           <el-input size="small" v-model="ruleForm.protocolName" maxlength="50" disabled style="widht:200px;" show-word-limit></el-input>
           <!-- <el-input v-model="ruleForm.protocolName" maxlength="30" show-word-limit></el-input> -->
         </el-form-item>        
+        <el-form-item label="腾讯问卷id" >
+          <el-input size="small" v-model="ruleForm.txWenJuanId" style="widht:200px;" disabled></el-input>
+          <!-- <el-input v-model="ruleForm.protocolName" maxlength="30" show-word-limit></el-input> -->
+        </el-form-item>    
         <el-form-item label="协议内容">
           <!-- <textarea v-model="ruleForm.content" id="detailEditor">
-              
           </textarea> -->
           <div style="width:375px;" v-html="ruleForm.content">
 

src/views/protocol/protocol-history.vue

@@ -50,7 +50,14 @@
             align="center"
             prop="protocolName"
             label="协议名称"
-            width="400"
+            width="200"
+            >
+          </el-table-column>
+          <el-table-column
+            align="center"
+            prop="txWenJuanId"
+            label="腾讯问卷id"
+            width="200"
             >
           </el-table-column>
           <el-table-column

src/views/protocol/protocol-list.vue

@@ -50,7 +50,14 @@
             align="center"
             prop="protocolName"
             label="协议名称"
-            width="400"
+            width="200"
+            >
+          </el-table-column>
+          <el-table-column
+            align="center"
+            prop="txWenJuanId"
+            label="腾讯问卷id"
+            width="200"
             >
           </el-table-column>
           <el-table-column