Merge branch 'master' into zhangteng

src/views/business/comps/template/comps/dl/DL011.vue

@@ -272,7 +272,9 @@ export default {
               copyFrom: 'fshxbyjtj',
               compareTo: 'fshxbyjtj',
               subOptions: this.getDictOptions('business_tjdw'),
-              maxlength: 10
+              maxlength: 10,
+              subDisabled:true
+              
             }
           }
         }
@@ -297,8 +299,15 @@ export default {
 
     // 只在实际填报模式下生成编号
     if (this.fillType !== 'actFill') return
-
+    
     const data = this.getFilledFormDataByRefs([refConf.xbxx])
+    if(!data.fshxbsjtjUnit){
+      this.$refs[refConf.xbxx].batchUpdateFormData({'fshxbsjtjUnit':data.fshxbyjtjUnit})
+    }
+    // 触发数据更新
+    setTimeout(() => {
+      this.justUpdateFilledFormData()
+    }, 100)
     const { fshxbbh, fshxbbhCodeSn } = data || {}
 
     // 如果已经有 fshxbbhCodeSn 值，说明是回显数据，不需要重新生成

src/views/business/study/comp/tbbd/Bj.vue

@@ -63,7 +63,8 @@
             <el-row>
               <el-col :span="24">
                 <el-form-item :label="$t('page.business.study.studyFormFill.sfbl')" prop="sfbl">
-                  <el-select v-model="form.sfbl" :placeholder="$t('form.placeholderSelect')" style="width: 100%;"  @change="validForm">
+                  <el-select v-model="form.sfbl" :placeholder="$t('form.placeholderSelect')" style="width: 100%;"
+                    @change="validForm">
                     <el-option :label="$t('page.business.study.studyFormFill.yes')" value="是" />
                     <el-option :label="$t('page.business.study.studyFormFill.no')" value="否" />
                   </el-select>
@@ -91,8 +92,8 @@
     <el-dialog :title="$t('page.business.study.studyFormFill.tjjl')" :visible.sync="openApprove" width="1200px"
       append-to-body :close-on-click-modal="false">
       <el-form ref="formApprove" :model="formApprove" :rules="rulesApprove" label-width="120px" v-if="openApprove">
-        <div class="sbzdtcma"> <input type="text"> <input type="password"  show-password> </div>
-        <el-row v-if="form.sftb == 1">
+        <div class="sbzdtcma"> <input type="text"> <input type="password" show-password> </div>
+        <el-row v-if="form.sftb == 1 && form.onlySubmit == 1">
           <el-col :psna="24">
             <el-form-item>
               <div><el-checkbox v-model="formApprove.sfcz" @change="sfczChange">{{
@@ -108,9 +109,12 @@
                       <div style="display: flex;justify-content: space-between;">
                         <div style="display: flex;">
                           <div> 处置方式：</div>
-                          <div>
-                            <BusinessSelect v-model="citem.czfs" dictType="business_czfs" style="width: 200px;">
+                          <div style="display: flex;">
+                            <BusinessSelect v-model="citem.czfs" @change="czfsChange(cindex)" dictType="business_czfs"
+                              style="width: 200px;">
                             </BusinessSelect>
+                            <el-input type="text" v-if="citem.czfs == '其他'" v-model="citem.czfsqt" maxlength="50"
+                              :placeholder="$t('form.placeholderInput')" style="width: 200px;" />
                           </div>
                         </div>
                         <div>
@@ -152,10 +156,12 @@
                           </div>
                           <div style="display: flex; margin-left: 10px;">
                             <div> 存储条件：</div>
-                            <div>
-                              <BusinessSelect v-model="citem.cctj" dictType="business_cctj" :multiple="true"
-                                style="width: 200px;">
+                            <div style="display: flex;">
+                              <BusinessSelect v-model="citem.cctj" @change="cctjChange(cindex)" dictType="business_cctj"
+                                :multiple="true" style="width: 200px;">
                               </BusinessSelect>
+                              <el-input type="text" v-if="citem.cctj == '其他'" v-model="citem.cctjqt" maxlength="50"
+                                :placeholder="$t('form.placeholderInput')" style="width: 200px;" />
                             </div>
                           </div>
                         </div>
@@ -225,8 +231,8 @@
           <el-col :span="24">
             <el-form-item :label="$t('form.password')" prop="qmrmm">
               <div class="sbzdtcma"> <input type="text"></div>
-              <el-input type="password" @contextmenu.native.prevent @copy.native.prevent @cut.native.prevent show-password v-model="formApprove.qmrmm" maxlength="20"
-                :placeholder="$t('form.placeholderInput')" />
+              <el-input type="password" @contextmenu.native.prevent @copy.native.prevent @cut.native.prevent
+                show-password v-model="formApprove.qmrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -240,7 +246,7 @@
     <el-dialog :title="$t('page.business.study.studyFormFill.yjcc')" :visible.sync="openYjcc" width="1200px"
       append-to-body :close-on-click-modal="false">
       <el-form ref="formYjcc" :model="formYjcc" :rules="rulesYjcc" label-width="120px" v-if="openYjcc">
-        <div class="sbzdtcma"> <input type="text"> <input type="password"  show-password> </div>
+        <div class="sbzdtcma"> <input type="text"> <input type="password" show-password> </div>
         <el-row>
           <el-col :psna="24">
             <el-form-item>
@@ -266,10 +272,12 @@
                           </div>
                           <div style="display: flex; margin-left: 10px;">
                             <div> 存储条件：</div>
-                            <div>
-                              <BusinessSelect v-model="citem.cctj" dictType="business_cctj" :multiple="true"
-                                style="width: 200px;">
+                            <div style="display: flex;">
+                              <BusinessSelect v-model="citem.cctj" @change="cctjYjChange(cindex)"
+                                dictType="business_cctj" :multiple="true" style="width: 200px;">
                               </BusinessSelect>
+                              <el-input type="text" v-if="citem.cctj == '其他'" v-model="citem.cctjqt" maxlength="50"
+                                :placeholder="$t('form.placeholderInput')" style="width: 200px;" />
                             </div>
                           </div>
                         </div>
@@ -318,8 +326,8 @@
           <el-col :span="24">
             <el-form-item :label="$t('form.password')" prop="qmrmm">
               <div class="sbzdtcma"> <input type="text"></div>
-              <el-input type="password" @contextmenu.native.prevent @copy.native.prevent @cut.native.prevent show-password v-model="formYjcc.qmrmm" maxlength="20"
-                :placeholder="$t('form.placeholderInput')" />
+              <el-input type="password" @contextmenu.native.prevent @copy.native.prevent @cut.native.prevent
+                show-password v-model="formYjcc.qmrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -333,7 +341,7 @@
     <el-dialog :title="$t('page.business.study.studyFormFill.bcjl')" :visible.sync="openSave" width="600px"
       append-to-body :close-on-click-modal="false">
       <el-form ref="formSave" :model="formSave" :rules="rulesSave" label-width="120px" v-if="openSave">
-        <div class="sbzdtcma"> <input type="text"> <input type="password"  show-password> </div>
+        <div class="sbzdtcma"> <input type="text"> <input type="password" show-password> </div>
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.qmyy')" prop="qmyy">
@@ -363,8 +371,8 @@
           <el-col :span="24">
             <el-form-item :label="$t('form.password')" prop="qmrmm">
               <div class="sbzdtcma"> <input type="text"></div>
-              <el-input type="password" @contextmenu.native.prevent @copy.native.prevent @cut.native.prevent show-password v-model="formSave.qmrmm" maxlength="20"
-                :placeholder="$t('form.placeholderInput')" />
+              <el-input type="password" @contextmenu.native.prevent @copy.native.prevent @cut.native.prevent
+                show-password v-model="formSave.qmrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -378,7 +386,7 @@
     <el-dialog :title="$t('page.business.study.studyFormFill.tjsh')" :visible.sync="openTjsh" width="600px"
       append-to-body :close-on-click-modal="false">
       <el-form ref="formTjsh" :model="formTjsh" :rules="rulesTjsh" label-width="120px" v-if="openTjsh">
-        <div class="sbzdtcma"> <input type="text"> <input type="password"  show-password> </div>
+        <div class="sbzdtcma"> <input type="text"> <input type="password" show-password> </div>
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.qmyy')" prop="qmyy">
@@ -408,8 +416,8 @@
           <el-col :span="24">
             <el-form-item :label="$t('form.password')" prop="qmrmm">
               <div class="sbzdtcma"> <input type="text"></div>
-              <el-input type="password" @contextmenu.native.prevent @copy.native.prevent @cut.native.prevent show-password v-model="formTjsh.qmrmm" maxlength="20"
-                :placeholder="$t('form.placeholderInput')" />
+              <el-input type="password" @contextmenu.native.prevent @copy.native.prevent @cut.native.prevent
+                show-password v-model="formTjsh.qmrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -486,6 +494,7 @@ export default {
         czfsqt: '',
         czids: '',
         sfcc: false,
+        cctjqt: '',
         cctj: '',
         ccwz: '',
         ccids: '',
@@ -502,6 +511,7 @@ export default {
         czids: '',
         sfcc: false,
         cctj: '',
+        cctjqt: '',
         ccwz: '',
         ccids: '',
       },
@@ -563,7 +573,7 @@ export default {
     this.getCcwz()
   },
   methods: {
-     validForm() {
+    validForm() {
       this.$refs["form"].validate(valid => {
         if (valid) { }
       })
@@ -578,6 +588,18 @@ export default {
         this.ccwzlist = response.rows
       })
     },
+    czfsChange(cindex) {
+      let that = this
+      that.czlist[cindex].czfsqt = ''
+    },
+    cctjChange(cindex) {
+      let that = this
+      that.cclist[cindex].cctjqt = ''
+    },
+    cctjYjChange(cindex) {
+      let that = this
+      that.cclistYj[cindex].cctjqt = ''
+    },
     ccwzChange(cindex) {
       let that = this
       let _index = _.findIndex(this.ccwzlist, function (item) {
@@ -629,21 +651,24 @@ export default {
     addCz() {
       this.czlist.push({
         list: [],
-        czfs: ''
+        czfs: '',
+        czfsqt: ''
       })
     },
     addCc() {
       this.cclist.push({
         list: [],
         cctj: '',
-        ccwz: ''
+        ccwz: '',
+        cctjqt: '',
       })
     },
     addCcYj() {
       this.cclistYj.push({
         list: [],
         cctj: '',
-        ccwz: ''
+        ccwz: '',
+        cctjqt: ''
       })
     },
     getInfo() {
@@ -980,6 +1005,10 @@ export default {
                 this.$modal.msgError('第' + (i + 1) + "个存储,存储条件不能为空")
                 return
               }
+              if (!that.cclistYj[i].cctjqt || that.cclistYj[i].cctjqt == '') {
+                this.$modal.msgError('第' + (i + 1) + "个存储,存储条件不能为空")
+                return
+              }
             }
             that.$modal.loading()
             that.formYjcc.resource = JSON.stringify(that.resourceYj)
@@ -999,7 +1028,6 @@ export default {
       let that = this
       this.$refs["formApprove"].validate(valid => {
         if (valid) {
-          that.$modal.loading()
           that.formApprove.resource = JSON.stringify(that.resource)
           that.formApprove.yqResource = JSON.stringify(that.yqResource)
           that.formApprove.jcbList = JSON.stringify(that.jcbList)
@@ -1010,6 +1038,32 @@ export default {
           if (that.cclist.length > 0) {
             that.formApprove.cclist = JSON.stringify(that.cclist)
           }
+          for (var i = 0; i < that.czlist.length; i++) {
+            if (!that.czlist[i].czfs || that.czlist[i].czfs == '') {
+              this.$modal.msgError('第' + (i + 1) + "个处置,处置方式不能为空")
+              return
+            }
+            if (!that.czlist[i].czfsqt || that.czlist[i].czfsqt == '') {
+              this.$modal.msgError('第' + (i + 1) + "个存储,处置方式不能为空")
+              return
+            }
+          }
+          for (var i = 0; i < that.cclist.length; i++) {
+            if (!that.cclist[i].ccwz || that.cclist[i].ccwz == '') {
+              this.$modal.msgError('第' + (i + 1) + "个存储,存储位置不能为空")
+              return
+            }
+            if (!that.cclist[i].cctj || that.cclist[i].cctj == '') {
+              this.$modal.msgError('第' + (i + 1) + "个存储,存储条件不能为空")
+              return
+            }
+            if (!that.cclist[i].cctjqt || that.cclist[i].cctjqt == '') {
+              this.$modal.msgError('第' + (i + 1) + "个存储,存储条件不能为空")
+              return
+            }
+          }
+          debugger
+          that.$modal.loading()
           studyFormFill_tj(that.formApprove).then(response => {
             that.openApprove = false
             that.$modal.closeLoading()

src/views/business/study/comp/wzlb/gyzjList.vue

@@ -114,11 +114,11 @@
                   v-hasPermi="['business:studyGyzj:rk', 'business:nonTrialGyzj:rk', 'business:drugGyzj:rk']">{{
                     $t('page.business.resource.gyzj.ruku') }}</el-button>
                 <!-- 取出 -->
-                <el-button type="text" v-if="scope.row.zjzt == 3 && scope.row.cczt == 3" @click="handleQc(scope.row)"
+                <el-button type="text" v-if="(scope.row.zjzt == 3||scope.row.zjzt == 2) && scope.row.cczt == 3" @click="handleQc(scope.row)"
                   v-hasPermi="['business:studyGyzj:qc', 'business:nonTrialGyzj:qc', 'business:drugGyzj:qc']">{{
                     $t('page.business.resource.gyzj.quchu') }}</el-button>
                 <!-- 存储 -->
-                <el-button type="text" v-if="scope.row.zjzt == 3 && scope.row.cczt == 1" @click="handleCc(scope.row)"
+                <el-button type="text" v-if="(scope.row.zjzt == 3||scope.row.zjzt == 2) && scope.row.cczt == 1" @click="handleCc(scope.row)"
                   v-hasPermi="['business:studyGyzj:cc', 'business:nonTrialGyzj:cc', 'business:drugGyzj:cc']">{{
                     $t('page.business.resource.gyzj.cunchu') }}</el-button>
               </template>

src/views/business/study/comp/wzlb/mjyList.vue

@@ -102,11 +102,11 @@
                       $t('page.business.resource.mjy.xgkc') }}</el-button>
                 </template>
                 <!-- 取出 -->
-                <el-button type="text" v-if="scope.row.zjzt == 3 && scope.row.cczt == 3" @click="handleQc(scope.row)"
+                <el-button type="text" v-if="(scope.row.zjzt == 3||scope.row.zjzt == 2) && scope.row.cczt == 3" @click="handleQc(scope.row)"
                   v-hasPermi="['business:studyMjy:qc', 'business:nonTrialMjy:qc', 'business:drugMjy:qc']">{{
                     $t('page.business.resource.gyzj.quchu') }}</el-button>
                 <!-- 存储 -->
-                <el-button type="text" v-if="scope.row.zjzt == 3 && scope.row.cczt == 1" @click="handleCc(scope.row)"
+                <el-button type="text" v-if="(scope.row.zjzt == 3||scope.row.zjzt == 2) && scope.row.cczt == 1" @click="handleCc(scope.row)"
                   v-hasPermi="['business:studyMjy:cc', 'business:nonTrialMjy:cc', 'business:drugMjy:cc']">{{
                     $t('page.business.resource.gyzj.cunchu') }}</el-button>
               </template>

src/views/business/template/list.vue

@@ -138,6 +138,15 @@
               </el-select>
             </el-form-item>
           </el-col>
+           <el-col :span="24">
+            <el-form-item label="仅提交：" prop="onlySubmit">
+              <el-select v-model="infoDialog.formData.onlySubmit" :placeholder="$t('form.placeholderSelect')"
+                style="width:100%">
+                <el-option label="否" :value="1" />
+                <el-option label="是" :value="10" />
+              </el-select>
+            </el-form-item>
+          </el-col>
             <el-col :span="24">
             <el-form-item label="是否需要病理学家审核：" prop="showBlxjsh">
               <el-select v-model="infoDialog.formData.showBlxjsh" :placeholder="$t('form.placeholderSelect')"
@@ -267,6 +276,9 @@ export default {
         },
 
         rules: {
+          onlySubmit: [
+            { required: true, message: '请选择', trigger: "blur" }
+          ],
           showGc: [
             { required: true, message: '请选择', trigger: "blur" }
           ],