Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/icore-pass

src/views/index/components/login.vue

@@ -108,10 +108,11 @@ export default {
           let form = JSON.parse(JSON.stringify(this.loginForm))
           form.app_code = 'web' //终端code暂时写死
           //传递密码明文进去
-          this.shaObj.update(form.password)
+          const shaObj = new JsSHA('SHA-1', 'TEXT', { encoding: 'UTF8' })
+          shaObj.update(form.password)
+          form.password = shaObj.getHash('HEX')
           console.log(form)
           //获得密码的哈希值
-          form.password = this.shaObj.getHash('HEX')
           console.log(form.password)
           this.store
             .dispatch('index/login/login', form)

src/views/inward/components/offsetSteel/saleSteelTruckOrder/kucunList.vue

@@ -84,7 +84,7 @@
             >批量保存</el-button
           >
         </el-form-item>
-        <el-form-item>
+        <!-- <el-form-item>
           <el-autocomplete
             class="inline-input"
             v-model="receiveName"
@@ -108,7 +108,7 @@
             >
             </el-option>
           </el-select>
-        </el-form-item>
+        </el-form-item> -->
       </el-form>
     </div>
     <div class="main">

src/views/inward/components/offsetSteel/saleSteelTruckOrder/saleTruckPreview.vue

@@ -223,7 +223,7 @@
           align="center"
           width="250px"
         >
-          <template slot-scope="scope">
+          <!-- <template slot-scope="scope">
             <el-autocomplete
               style="width: 120px"
               v-model="scope.row.carrierName"
@@ -239,7 +239,7 @@
               v-if="scope.row.isCarrierShow == 1"
               >提交</el-button
             >
-          </template>
+          </template> -->
         </el-table-column>
         <el-table-column
           prop="orderNumber"

src/views/queue/components/qmsEnFacotory/queueFStart.vue

@@ -802,20 +802,6 @@ export default {
           .then(res => {
             this.tableData1 = res.data.data
           })
-      } else if (this.activeName == 'second') {
-        this.axios
-          .post('/api/v1/qms/getQueueListByQueueUp?apiId=473&isSpelling=1', map)
-          .then(res => {
-            this.tableData = res.data.data
-            this.getSpanArr(this.tableData)
-          })
-      } else if (this.activeName == 'fourth') {
-        this.axios
-          .post('/api/v1/qms/getQueueListByQueueUp?apiId=473&isSpelling=2', map)
-          .then(res => {
-            this.tableData2 = res.data.data
-            this.getSpanArr1(this.tableData2)
-          })
       }
       this.table1 = false
     },