Revert "Merge branch 'feature/jq' into 'release'"

This reverts commit 7236d6ff, reversing
changes made to f29b38f3.

src/views/goods/create-good.vue

@@ -18,7 +18,7 @@
             label-suffix="："
             class="basic-form"
         >
-        <!-- 通用信息 -->
+
           <div class="basic-item-icon">
             <div class="part-tit">通用信息</div>
             <el-form-item label="商品名称" prop="goodsName">
@@ -185,8 +185,6 @@
           </div>
         </el-form>
 
-
-        <!-- 基本信息 -->
         <el-form
             ref="formData1"
             :model="formData1"
@@ -195,7 +193,7 @@
             label-suffix="："
             class="basic-form"
         >
-          <div class="basic-item-icon" v-if="!isCheckServe && !showTcm">
+          <div class="basic-item-icon" v-show="!isCheckServe">
             <div class="part-tit">基本信息</div>
             <el-form-item label="条形码" prop="barCode">
               <el-col :span="18">
@@ -492,96 +490,21 @@
               <p class="upload-message" v-if="!isSpecification_url">请上传说明书</p>
             </el-form-item>
           </div>
-          <div class="basic-item-icon" v-show="showTcm">
-            <div class="part-tit">基本信息</div>
-             <el-form-item label="适用项目" prop="useProject" class="required-label">
-              <el-col :span="13">
-                <el-input
-                    :disabled="goodDisabled || barAndGoodsFlag || idMedicEdit"
-                    size="small"
-                    v-model="formData1.useProject"
-                    placeholder="请输入适用项目"
-                    style="width:70%;"
-                    maxlength="40"
-                    show-word-limit
-                ></el-input>
-              </el-col>
-            </el-form-item>
-            <div class="inline">
-              <el-form-item label="适用科室" prop="department" class="required-label">
-                <el-input
-                    size="small"
-                    v-model="formData1.department"
-                    placeholder="请输入适用科室"
-                    :disabled="idMedicEdit"
-                ></el-input>
-              </el-form-item>
-              <el-form-item label="治疗疾病" prop="treatDisease" class="required-label">
-                <el-col :span="24">
-                  <el-input
-                      size="small"
-                      v-model="formData1.treatDisease"
-                      placeholder="请输入治疗疾病"
-                      :disabled="idMedicEdit"
+        </el-form>
+
+
+
+
+
+
 
-                  ></el-input>
 
-                  <span class="word-num"></span>
-                </el-col>
-              </el-form-item>
-            </div>
-            <el-form-item label="商品使用时间" prop="rangeTime" class="required-label">
-              <el-col :span="8">
-                <el-date-picker
-                  v-model="rangeTime"
-                  type="daterange"
-                  value-format="yyyy-MM-dd"
-                  start-placeholder="开始日期"
-                  end-placeholder="结束日期"
-                  :disabled="idMedicEdit"
-                >
-                </el-date-picker>
-              </el-col>  
-              </el-form-item>
-            
-            <el-form-item label="说明书">
-              <el-upload
-                  class="bg-uploader"
-                  action="#"
-                  :show-file-list="false"
-                  :before-upload="beforeUploadPic1"
-              >
-                <div v-if="fileIntrList.length > 0">
-                  <div class="file-pics" v-if="item.url" :key="index" v-for="(item,index) in fileIntrList">
-                    <img :src="item.url" @mouseover.stop="intrIndex=index" class="bg-img"/>
-                     <div
-                         class="img-delete"
-                         v-if="intrIndex==index"
-                         @click.stop="deleteImg(item,fileIntrList)"
-                         @mouseout.stop="intrIndex=-1"
-                     >
-                       <i class="el-icon-delete"></i>
-                     </div>
-                  </div>
-                </div>
 
-                <img  class="bg-img" src="../../assets/image/small.png" />
-                <div class="limit-text">
-                  <p>限制大小: 2M</p>
-                  <!-- <p>最小尺寸：750*420</p> -->
-                  <p>支持jpeg, png格式</p>
-                </div>
-              </el-upload>
-              <p class="upload-message" v-if="!isSpecification_url">请上传说明书</p>
-            </el-form-item>
-          </div>
-        </el-form>
 <!-- =========================================================调试新增检测服务 start=========================================================
 =========================================================调试新增检测服务 start=========================================================
 =========================================================调试新增检测服务 start========================================================= -->
 
 
-<!-- 服务信息 -->
         <el-form
             ref="formData2"
             :model="formData2"
@@ -590,7 +513,7 @@
             label-suffix="："
             class="basic-form"
         >
-          <div class="basic-item-icon" v-show="!isMedic && isCheckServe && !showTcm">
+          <div class="basic-item-icon" v-show="!isMedic && isCheckServe">
             <div class="part-tit">服务信息</div>
             <el-form-item label="条形码" prop="barCode">
               <el-col :span="18">
@@ -780,12 +703,26 @@
           </div>
         </el-form>
 
+
+
+
+
 <!-- =========================================================调试新增检测服务 start=========================================================
 =========================================================调试新增检测服务 start=========================================================
 =========================================================调试新增检测服务 start========================================================= -->
 
 
-<!-- 销售信息 -->
+
+
+
+
+
+
+
+
+
+
+
         <el-form
             ref="formData"
             :model="formData"
@@ -1111,13 +1048,6 @@
         contractList: [], // 合同
         isProject: false, // 是否选择合作项目
         isContract: false, // 是否选择合同
-        showTcm:false,
-        rangeTime:'',
-      //   pickerOptions: {
-      //   disabledDate: (time) => {
-      //     return time.getTime() > new Date().getTime(); //减去一天的时间代表可以选择同一天;
-      //   },
-      // },
       }
     },
     computed: {
@@ -1332,12 +1262,6 @@
           if(this.isProject) {this.getContractList(cooperationProjectId)}
           this.isContract = Boolean(contractId);
           this.formData1 = goodDet;
-          if (this.formData1.goodsType == 340) {
-            this.showTcm = true;
-            if (this.formData1.useBeginTime && this.formData1.useEndTime) {
-              this.rangeTime = [new Date(this.formData1.useBeginTime).format("yyyy-MM-dd"), new Date(this.formData1.useEndTime).format("yyyy-MM-dd")]
-            }
-          }
           this.formData = goodDet;
           this.formData3 =  { goodsName, goodsDescription, goodsHeaderImages, goodsVideoList, goodsType, expressLimitFlag,contractId, cooperationProjectId };
           this.hasRepoFlag = hasRepoFlag;
@@ -1486,7 +1410,6 @@
         this.goodsType = goodsType;
         if(goodsType == 337){
           this.isMedic = false;
-          this.showTcm = false;
           this.isCheckServe = true;
           getHospitalInfoByStoreId(this.storeId).then(({code,message,data})=>{
             this.formData2.hospitalName = data.hospital;
@@ -1496,16 +1419,10 @@
             this.checkPackageIdList = res.data;
           })
         }else{
-          if (goodsType == 340) {
-            this.showTcm = true;
-          }else {
-            this.isMedic = goodsType == '5';
-            this.isCheckServe = false;
-            this.showTcm = false;
-            this.getLever(goodsType,type);
-          }
+          this.isMedic = goodsType == '5';
+          this.isCheckServe = false;
+          this.getLever(goodsType,type);
         }
-        console.log(goodsType,type);
         console.log(this.formData);
       },
       defaultArr(){
@@ -1612,15 +1529,6 @@
 
       },
       complete() {
-        if (this.goodsType == 340 ) {
-          this.formData1.otc1 = "0";
-        }
-        console.log(this.formData1);
-        console.log(this.rangeTime);
-        this.formData1.useBeginTime  = new Date(this.rangeTime ? this.rangeTime[0] + ' ' + '00:00:00' : '').getTime() || '';
-				this.formData1.useEndTime  = new Date(this.rangeTime ? this.rangeTime[1] + ' ' + '23:59:59' : '').getTime() || '';
-        console.log('==============');
-        // debugger;
         this.formData1.leastCount = this.formData.leastCount;
         this.formData1.mostCount = this.formData.mostCount;
         let formNameList = ['formData', 'formData1', 'formData2', 'formData3'];